diff --git a/appservice/resource-manager/v2016_03_01/pom.xml b/appservice/resource-manager/v2016_03_01/pom.xml
index f6d54f5eeb3d..c8494595b172 100644
--- a/appservice/resource-manager/v2016_03_01/pom.xml
+++ b/appservice/resource-manager/v2016_03_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.appservice.v2016_03_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-appservice</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Web Management</name>
-    <description>This package contains Microsoft Web Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.appservice.v2016_03_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-web</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Web Management</name>
+    <description>This package contains Microsoft Web Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
index edfe33751fac..66d383a614fa 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AnalysisDefinitionInner;
 
 /**
  * Type representing AnalysisDefinition.
  */
-public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<AppServiceManager> {
+public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
index 2b7e1a6f92d5..665174ff6282 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.ApplicationStackInner;
 import java.util.List;
 
 /**
  * Type representing ApplicationStack.
  */
-public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<AppServiceManager> {
+public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<WebManager> {
     /**
      * @return the dependency value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
index c5e3d1e71302..1d1a88afa936 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.BillingMeterInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 
 /**
  * Type representing BillingMeter.
  */
-public interface BillingMeter extends HasInner<BillingMeterInner>, HasManager<AppServiceManager> {
+public interface BillingMeter extends HasInner<BillingMeterInner>, HasManager<WebManager> {
     /**
      * @return the billingLocation value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
index be1b2d209509..fbcede953f24 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.CertificateInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Certificate.
  */
-public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<AppServiceManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<AppServiceManager> {
+public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<WebManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<WebManager> {
     /**
      * @return the cerBlob value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
index 4151455c6d49..e31b1a4e033f 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.CsmOperationDescriptionInner;
 
 /**
  * Type representing CsmOperationDescription.
  */
-public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<AppServiceManager> {
+public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<WebManager> {
     /**
      * @return the display value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
index 3c43ee63642d..964d94ad85ca 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DeletedSiteInner;
 
 /**
  * Type representing DeletedSite.
  */
-public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<AppServiceManager> {
+public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<WebManager> {
     /**
      * @return the deletedTimestamp value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
index 05498b7112be..c50b66b34dba 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DetectorDefinitionInner;
 
 /**
  * Type representing DetectorDefinition.
  */
-public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<AppServiceManager> {
+public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
index 27ee8c59f92a..b8dbcff79953 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing DetectorResponse.
  */
-public interface DetectorResponse extends HasInner<DetectorResponseInner>, Indexable, Refreshable<DetectorResponse>, HasManager<AppServiceManager> {
+public interface DetectorResponse extends HasInner<DetectorResponseInner>, Indexable, Refreshable<DetectorResponse>, HasManager<WebManager> {
     /**
      * @return the dataset value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
index ef113eae9265..567a0240dbf6 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 
 /**
  * Type representing DiagnosticAnalysis.
  */
-public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<AppServiceManager> {
+public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<WebManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
index ae9ce2cecfd8..0925814107e7 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 
 /**
  * Type representing DiagnosticCategory.
  */
-public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<AppServiceManager> {
+public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
index e8930ebe1209..8c3bbc219e0c 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DiagnosticDetectorResponseInner;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DetectorDefinitionInner;
@@ -19,7 +19,7 @@
 /**
  * Type representing DiagnosticDetectorResponse.
  */
-public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<AppServiceManager> {
+public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<WebManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
index 0bd4b2cdf51a..4495e9d9e540 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.RecommendationInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.UUID;
 import java.util.List;
@@ -19,7 +19,7 @@
 /**
  * Type representing Recommendation.
  */
-public interface Recommendation extends HasInner<RecommendationInner>, HasManager<AppServiceManager> {
+public interface Recommendation extends HasInner<RecommendationInner>, HasManager<WebManager> {
     /**
      * @return the actionName value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
index 15408267f21c..f6b9b2792025 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.RecommendationRuleInner;
 import java.util.UUID;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing RecommendationRule.
  */
-public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<AppServiceManager> {
+public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<WebManager> {
     /**
      * @return the actionName value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
index 622451af120c..2ecfa43c81a1 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.ResourceHealthMetadataInner;
 
 /**
  * Type representing ResourceHealthMetadata.
  */
-public interface ResourceHealthMetadata extends HasInner<ResourceHealthMetadataInner>, HasManager<AppServiceManager> {
+public interface ResourceHealthMetadata extends HasInner<ResourceHealthMetadataInner>, HasManager<WebManager> {
     /**
      * @return the category value.
      */
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
index 763192721fd9..05b2769de911 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class AnalysisDefinitionImpl extends WrapperImpl<AnalysisDefinitionInner> implements AnalysisDefinition {
-    private final AppServiceManager manager;
-    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
index 56377d323cd4..327ba44c8e62 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.StackMajorVersion;
 
 class ApplicationStackImpl extends WrapperImpl<ApplicationStackInner> implements ApplicationStack {
-    private final AppServiceManager manager;
-    ApplicationStackImpl(ApplicationStackInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    ApplicationStackImpl(ApplicationStackInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
index 3c858d4e48c9..53f5da990982 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
@@ -14,15 +14,15 @@
 import rx.Observable;
 
 class BillingMeterImpl extends WrapperImpl<BillingMeterInner> implements BillingMeter {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    BillingMeterImpl(BillingMeterInner inner,  AppServiceManager manager) {
+    BillingMeterImpl(BillingMeterInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
index 140807a072d7..c7b46dece5e4 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
@@ -20,9 +20,9 @@
 
 class BillingMetersImpl extends WrapperImpl<BillingMetersInner> implements BillingMeters {
     private PagedListConverter<BillingMeterInner, BillingMeter> converter;
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    BillingMetersImpl(AppServiceManager manager) {
+    BillingMetersImpl(WebManager manager) {
         super(manager.inner().billingMeters());
         this.manager = manager;
         this.converter = new PagedListConverter<BillingMeterInner, BillingMeter>() {
@@ -33,7 +33,7 @@ public Observable<BillingMeter> typeConvertAsync(BillingMeterInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
index d50bef8c2c14..1283afabc7ea 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
@@ -18,9 +18,9 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.KeyVaultSecretStatus;
 import rx.functions.Func1;
 
-class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, AppServiceManager> implements Certificate, Certificate.Definition, Certificate.Update {
+class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, WebManager> implements Certificate, Certificate.Definition, Certificate.Update {
     private CertificatePatchResource updateParameter;
-    CertificateImpl(String name, CertificateInner inner, AppServiceManager manager) {
+    CertificateImpl(String name, CertificateInner inner, WebManager manager) {
         super(name, inner, manager);
         this.updateParameter = new CertificatePatchResource();
     }
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
index 90a9f9e7df2d..6aee259e33b6 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
@@ -23,8 +23,8 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 
-class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, AppServiceManager>  implements Certificates {
-    protected CertificatesImpl(AppServiceManager manager) {
+class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, WebManager>  implements Certificates {
+    protected CertificatesImpl(WebManager manager) {
         super(manager.inner().certificates(), manager);
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
index bb5ce402ef4d..08215370c3d9 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.CsmOperationDescriptionProperties;
 
 class CsmOperationDescriptionImpl extends WrapperImpl<CsmOperationDescriptionInner> implements CsmOperationDescription {
-    private final AppServiceManager manager;
-    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
index fd1053715363..7359b1ede40c 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DeletedSiteImpl extends WrapperImpl<DeletedSiteInner> implements DeletedSite {
-    private final AppServiceManager manager;
-    DeletedSiteImpl(DeletedSiteInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DeletedSiteImpl(DeletedSiteInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
index 658ad6aae41d..ca47be22d4f7 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.DeletedSite;
 
 class DeletedWebAppsImpl extends WrapperImpl<DeletedWebAppsInner> implements DeletedWebApps {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    DeletedWebAppsImpl(AppServiceManager manager) {
+    DeletedWebAppsImpl(WebManager manager) {
         super(manager.inner().deletedWebApps());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
index d6b2a88082c5..c6d2c993d154 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DetectorDefinitionImpl extends WrapperImpl<DetectorDefinitionInner> implements DetectorDefinition {
-    private final AppServiceManager manager;
-    DetectorDefinitionImpl(DetectorDefinitionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DetectorDefinitionImpl(DetectorDefinitionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
index d656ba1e9a81..53eb85fe1af1 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.DetectorInfo;
 
 class DetectorResponseImpl extends IndexableRefreshableWrapperImpl<DetectorResponse, DetectorResponseInner> implements DetectorResponse {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String detectorName;
 
-    DetectorResponseImpl(DetectorResponseInner inner,  AppServiceManager manager) {
+    DetectorResponseImpl(DetectorResponseInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -30,7 +30,7 @@ class DetectorResponseImpl extends IndexableRefreshableWrapperImpl<DetectorRespo
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
index 43c7aa0b7735..bad021e44db1 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
@@ -19,13 +19,13 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.AnalysisData;
 
 class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticAnalysis, DiagnosticAnalysisInner> implements DiagnosticAnalysis {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
     private String analysisName;
 
-    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  AppServiceManager manager) {
+    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -35,7 +35,7 @@ class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticA
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
index e47a7476cdbd..c092e3c81866 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticCategory, DiagnosticCategoryInner> implements DiagnosticCategory {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
 
-    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  AppServiceManager manager) {
+    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -27,7 +27,7 @@ class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticC
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
index 6f69574bb66d..082c07d50edb 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.ResponseMetaData;
 
 class DiagnosticDetectorResponseImpl extends WrapperImpl<DiagnosticDetectorResponseInner> implements DiagnosticDetectorResponse {
-    private final AppServiceManager manager;
-    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
index 6d3e99954167..5cb3a680e242 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
@@ -22,14 +22,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.AnalysisDefinition;
 
 class DiagnosticsImpl extends WrapperImpl<DiagnosticsInner> implements Diagnostics {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    DiagnosticsImpl(AppServiceManager manager) {
+    DiagnosticsImpl(WebManager manager) {
         super(manager.inner().diagnostics());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
index 942e7c4c6072..fc02280d9181 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.CsmOperationDescription;
 
 class ProvidersImpl extends WrapperImpl<ProvidersInner> implements Providers {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ProvidersImpl(AppServiceManager manager) {
+    ProvidersImpl(WebManager manager) {
         super(manager.inner().providers());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
index cde7878c8dc8..6948fc99fbf8 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
@@ -20,15 +20,15 @@
 import java.util.List;
 
 class RecommendationImpl extends WrapperImpl<RecommendationInner> implements Recommendation {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    RecommendationImpl(RecommendationInner inner,  AppServiceManager manager) {
+    RecommendationImpl(RecommendationInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
index 85f3887c87d4..9b92b783d063 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
@@ -16,14 +16,14 @@
 import java.util.List;
 
 class RecommendationRuleImpl extends WrapperImpl<RecommendationRuleInner> implements RecommendationRule {
-    private final AppServiceManager manager;
-    RecommendationRuleImpl(RecommendationRuleInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    RecommendationRuleImpl(RecommendationRuleInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
index f3dee043ff31..4c47ce84183b 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
@@ -22,9 +22,9 @@
 
 class RecommendationsImpl extends WrapperImpl<RecommendationsInner> implements Recommendations {
     private PagedListConverter<RecommendationInner, Recommendation> converter;
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    RecommendationsImpl(AppServiceManager manager) {
+    RecommendationsImpl(WebManager manager) {
         super(manager.inner().recommendations());
         this.manager = manager;
         this.converter = new PagedListConverter<RecommendationInner, Recommendation>() {
@@ -35,7 +35,7 @@ public Observable<Recommendation> typeConvertAsync(RecommendationInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
index c04b517e705e..a48148374856 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class ResourceHealthMetadataImpl extends WrapperImpl<ResourceHealthMetadataInner> implements ResourceHealthMetadata {
-    private final AppServiceManager manager;
-    ResourceHealthMetadataImpl(ResourceHealthMetadataInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    ResourceHealthMetadataImpl(ResourceHealthMetadataInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
index 5c6f8969153e..40135f07c039 100644
--- a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.ResourceHealthMetadata;
 
 class ResourceHealthMetadatasImpl extends WrapperImpl<ResourceHealthMetadatasInner> implements ResourceHealthMetadatas {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ResourceHealthMetadatasImpl(AppServiceManager manager) {
+    ResourceHealthMetadatasImpl(WebManager manager) {
         super(manager.inner().resourceHealthMetadatas());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java
new file mode 100644
index 000000000000..af4232f07b0b
--- /dev/null
+++ b/appservice/resource-manager/v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2016_03_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.appservice.v2016_03_01.Certificates;
+import com.microsoft.azure.management.appservice.v2016_03_01.DeletedWebApps;
+import com.microsoft.azure.management.appservice.v2016_03_01.Diagnostics;
+import com.microsoft.azure.management.appservice.v2016_03_01.Providers;
+import com.microsoft.azure.management.appservice.v2016_03_01.Recommendations;
+import com.microsoft.azure.management.appservice.v2016_03_01.ResourceHealthMetadatas;
+import com.microsoft.azure.management.appservice.v2016_03_01.BillingMeters;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Web resource management.
+ */
+public final class WebManager extends ManagerCore<WebManager, WebSiteManagementClientImpl> {
+    private Certificates certificates;
+    private DeletedWebApps deletedWebApps;
+    private Diagnostics diagnostics;
+    private Providers providers;
+    private Recommendations recommendations;
+    private ResourceHealthMetadatas resourceHealthMetadatas;
+    private BillingMeters billingMeters;
+    /**
+    * Get a Configurable instance that can be used to create WebManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new WebManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new WebManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(RestClient restClient, String subscriptionId) {
+        return new WebManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of WebManager that exposes Web management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Web management API entry points that work across subscriptions
+        */
+        WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Certificates.
+     */
+    public Certificates certificates() {
+        if (this.certificates == null) {
+            this.certificates = new CertificatesImpl(this);
+        }
+        return this.certificates;
+    }
+
+    /**
+     * @return Entry point to manage DeletedWebApps.
+     */
+    public DeletedWebApps deletedWebApps() {
+        if (this.deletedWebApps == null) {
+            this.deletedWebApps = new DeletedWebAppsImpl(this);
+        }
+        return this.deletedWebApps;
+    }
+
+    /**
+     * @return Entry point to manage Diagnostics.
+     */
+    public Diagnostics diagnostics() {
+        if (this.diagnostics == null) {
+            this.diagnostics = new DiagnosticsImpl(this);
+        }
+        return this.diagnostics;
+    }
+
+    /**
+     * @return Entry point to manage Providers.
+     */
+    public Providers providers() {
+        if (this.providers == null) {
+            this.providers = new ProvidersImpl(this);
+        }
+        return this.providers;
+    }
+
+    /**
+     * @return Entry point to manage Recommendations.
+     */
+    public Recommendations recommendations() {
+        if (this.recommendations == null) {
+            this.recommendations = new RecommendationsImpl(this);
+        }
+        return this.recommendations;
+    }
+
+    /**
+     * @return Entry point to manage ResourceHealthMetadatas.
+     */
+    public ResourceHealthMetadatas resourceHealthMetadatas() {
+        if (this.resourceHealthMetadatas == null) {
+            this.resourceHealthMetadatas = new ResourceHealthMetadatasImpl(this);
+        }
+        return this.resourceHealthMetadatas;
+    }
+
+    /**
+     * @return Entry point to manage BillingMeters.
+     */
+    public BillingMeters billingMeters() {
+        if (this.billingMeters == null) {
+            this.billingMeters = new BillingMetersImpl(this);
+        }
+        return this.billingMeters;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return WebManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private WebManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new WebSiteManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/appservice/resource-manager/v2016_08_01/pom.xml b/appservice/resource-manager/v2016_08_01/pom.xml
index 77aadf2d9ebf..8e8c2d99094e 100644
--- a/appservice/resource-manager/v2016_08_01/pom.xml
+++ b/appservice/resource-manager/v2016_08_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.appservice.v2016_08_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-appservice</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Web Management</name>
-    <description>This package contains Microsoft Web Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.appservice.v2016_08_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-web</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Web Management</name>
+    <description>This package contains Microsoft Web Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupItem.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupItem.java
index 789791ad257c..1c48926d778e 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupItem.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupItem.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing BackupItem.
  */
-public interface BackupItem extends HasInner<BackupItemInner>, Indexable, Refreshable<BackupItem>, HasManager<AppServiceManager> {
+public interface BackupItem extends HasInner<BackupItemInner>, Indexable, Refreshable<BackupItem>, HasManager<WebManager> {
     /**
      * @return the backupId value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupRequest.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupRequest.java
index a7cc515db249..23e58c00b441 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupRequest.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/BackupRequest.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.BackupRequestInner;
 import java.util.List;
 
 /**
  * Type representing BackupRequest.
  */
-public interface BackupRequest extends HasInner<BackupRequestInner>, HasManager<AppServiceManager> {
+public interface BackupRequest extends HasInner<BackupRequestInner>, HasManager<WebManager> {
     /**
      * @return the backupRequestName value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ConnectionStringDictionary.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ConnectionStringDictionary.java
index 284720aa8931..d2166677e443 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ConnectionStringDictionary.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ConnectionStringDictionary.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.ConnectionStringDictionaryInner;
 import java.util.Map;
 
 /**
  * Type representing ConnectionStringDictionary.
  */
-public interface ConnectionStringDictionary extends HasInner<ConnectionStringDictionaryInner>, HasManager<AppServiceManager> {
+public interface ConnectionStringDictionary extends HasInner<ConnectionStringDictionaryInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ContinuousWebJob.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ContinuousWebJob.java
index b54e24522c34..14fb88564d23 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ContinuousWebJob.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ContinuousWebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.Map;
 
 /**
  * Type representing ContinuousWebJob.
  */
-public interface ContinuousWebJob extends HasInner<ContinuousWebJobInner>, Indexable, Refreshable<ContinuousWebJob>, HasManager<AppServiceManager> {
+public interface ContinuousWebJob extends HasInner<ContinuousWebJobInner>, Indexable, Refreshable<ContinuousWebJob>, HasManager<WebManager> {
     /**
      * @return the continuousWebJobName value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CsmUsageQuota.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CsmUsageQuota.java
index 0f0390085227..1654c2649ae8 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CsmUsageQuota.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CsmUsageQuota.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.CsmUsageQuotaInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing CsmUsageQuota.
  */
-public interface CsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<AppServiceManager> {
+public interface CsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<WebManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CustomHostnameAnalysisResult.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CustomHostnameAnalysisResult.java
index e32fc44cefd0..8982b2b97cc5 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CustomHostnameAnalysisResult.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/CustomHostnameAnalysisResult.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.CustomHostnameAnalysisResultInner;
 import java.util.List;
 
 /**
  * Type representing CustomHostnameAnalysisResult.
  */
-public interface CustomHostnameAnalysisResult extends HasInner<CustomHostnameAnalysisResultInner>, HasManager<AppServiceManager> {
+public interface CustomHostnameAnalysisResult extends HasInner<CustomHostnameAnalysisResultInner>, HasManager<WebManager> {
     /**
      * @return the alternateCNameRecords value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Deployment.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Deployment.java
index 03b9ef8a5339..8368816e478e 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Deployment.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Deployment.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing Deployment.
  */
-public interface Deployment extends HasInner<DeploymentInner>, Indexable, Refreshable<Deployment>, Updatable<Deployment.Update>, HasManager<AppServiceManager> {
+public interface Deployment extends HasInner<DeploymentInner>, Indexable, Refreshable<Deployment>, Updatable<Deployment.Update>, HasManager<WebManager> {
     /**
      * @return the active value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionEnvelope.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionEnvelope.java
index 7646a39f7699..c4647d331e44 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionEnvelope.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionEnvelope.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.Map;
 
 /**
  * Type representing FunctionEnvelope.
  */
-public interface FunctionEnvelope extends HasInner<FunctionEnvelopeInner>, Indexable, Refreshable<FunctionEnvelope>, Updatable<FunctionEnvelope.Update>, HasManager<AppServiceManager> {
+public interface FunctionEnvelope extends HasInner<FunctionEnvelopeInner>, Indexable, Refreshable<FunctionEnvelope>, Updatable<FunctionEnvelope.Update>, HasManager<WebManager> {
     /**
      * @return the config value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionSecrets.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionSecrets.java
index 9389d1f75e35..21dc165efdc5 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionSecrets.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/FunctionSecrets.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.FunctionSecretsInner;
 
 /**
  * Type representing FunctionSecrets.
  */
-public interface FunctionSecrets extends HasInner<FunctionSecretsInner>, HasManager<AppServiceManager> {
+public interface FunctionSecrets extends HasInner<FunctionSecretsInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HostNameBinding.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HostNameBinding.java
index 90cbe5f0d16e..7d1b53b21b38 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HostNameBinding.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HostNameBinding.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing HostNameBinding.
  */
-public interface HostNameBinding extends HasInner<HostNameBindingInner>, Indexable, Refreshable<HostNameBinding>, Updatable<HostNameBinding.Update>, HasManager<AppServiceManager> {
+public interface HostNameBinding extends HasInner<HostNameBindingInner>, Indexable, Refreshable<HostNameBinding>, Updatable<HostNameBinding.Update>, HasManager<WebManager> {
     /**
      * @return the azureResourceName value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnection.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnection.java
index 143ba31fe58a..e2e0cdaae0cc 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnection.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnection.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing HybridConnection.
  */
-public interface HybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<HybridConnection>, Updatable<HybridConnection.Update>, HasManager<AppServiceManager> {
+public interface HybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<HybridConnection>, Updatable<HybridConnection.Update>, HasManager<WebManager> {
     /**
      * @return the hostname value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnectionKey.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnectionKey.java
index 5db734a7a46b..a9bb4270a054 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnectionKey.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/HybridConnectionKey.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.HybridConnectionKeyInner;
 
 /**
  * Type representing HybridConnectionKey.
  */
-public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<AppServiceManager> {
+public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Identifier.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Identifier.java
index 03ceca0f72f0..7d2c29fc6d29 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Identifier.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Identifier.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing Identifier.
  */
-public interface Identifier extends HasInner<IdentifierInner>, Indexable, Refreshable<Identifier>, Updatable<Identifier.Update>, HasManager<AppServiceManager> {
+public interface Identifier extends HasInner<IdentifierInner>, Indexable, Refreshable<Identifier>, Updatable<Identifier.Update>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeploy.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeploy.java
index 2abad972d739..8b7a05b4103f 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeploy.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeploy.java
@@ -9,6 +9,7 @@
 package com.microsoft.azure.management.appservice.v2016_08_01;
 
 import java.util.Map;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 
@@ -66,6 +67,13 @@ public class MSDeploy extends ProxyOnlyResource {
     @JsonProperty(value = "properties.appOffline")
     private Boolean appOffline;
 
+    /**
+     * List of Add-On packages. Add-On packages implicitly enable the Do Not
+     * Delete MSDeploy rule.
+     */
+    @JsonProperty(value = "properties.addOnPackages")
+    private List<MSDeployCore> addOnPackages;
+
     /**
      * Get package URI.
      *
@@ -214,4 +222,24 @@ public MSDeploy withAppOffline(Boolean appOffline) {
         return this;
     }
 
+    /**
+     * Get list of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.
+     *
+     * @return the addOnPackages value
+     */
+    public List<MSDeployCore> addOnPackages() {
+        return this.addOnPackages;
+    }
+
+    /**
+     * Set list of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.
+     *
+     * @param addOnPackages the addOnPackages value to set
+     * @return the MSDeploy object itself.
+     */
+    public MSDeploy withAddOnPackages(List<MSDeployCore> addOnPackages) {
+        this.addOnPackages = addOnPackages;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployCore.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployCore.java
new file mode 100644
index 000000000000..75e4eb067a28
--- /dev/null
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployCore.java
@@ -0,0 +1,215 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2016_08_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * MSDeploy ARM PUT core information.
+ */
+public class MSDeployCore {
+    /**
+     * Package URI.
+     */
+    @JsonProperty(value = "packageUri")
+    private String packageUri;
+
+    /**
+     * SQL Connection String.
+     */
+    @JsonProperty(value = "connectionString")
+    private String connectionString;
+
+    /**
+     * Database Type.
+     */
+    @JsonProperty(value = "dbType")
+    private String dbType;
+
+    /**
+     * URI of MSDeploy Parameters file. Must not be set if SetParameters is
+     * used.
+     */
+    @JsonProperty(value = "setParametersXmlFileUri")
+    private String setParametersXmlFileUri;
+
+    /**
+     * MSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     */
+    @JsonProperty(value = "setParameters")
+    private Map<String, String> setParameters;
+
+    /**
+     * Controls whether the MSDeploy operation skips the App_Data directory.
+     * If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory
+     * on the destination
+     * will not be deleted, and any App_Data directory in the source will be
+     * ignored.
+     * Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     */
+    @JsonProperty(value = "skipAppData")
+    private Boolean skipAppData;
+
+    /**
+     * Sets the AppOffline rule while the MSDeploy operation executes.
+     * Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     */
+    @JsonProperty(value = "appOffline")
+    private Boolean appOffline;
+
+    /**
+     * Get package URI.
+     *
+     * @return the packageUri value
+     */
+    public String packageUri() {
+        return this.packageUri;
+    }
+
+    /**
+     * Set package URI.
+     *
+     * @param packageUri the packageUri value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withPackageUri(String packageUri) {
+        this.packageUri = packageUri;
+        return this;
+    }
+
+    /**
+     * Get sQL Connection String.
+     *
+     * @return the connectionString value
+     */
+    public String connectionString() {
+        return this.connectionString;
+    }
+
+    /**
+     * Set sQL Connection String.
+     *
+     * @param connectionString the connectionString value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withConnectionString(String connectionString) {
+        this.connectionString = connectionString;
+        return this;
+    }
+
+    /**
+     * Get database Type.
+     *
+     * @return the dbType value
+     */
+    public String dbType() {
+        return this.dbType;
+    }
+
+    /**
+     * Set database Type.
+     *
+     * @param dbType the dbType value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withDbType(String dbType) {
+        this.dbType = dbType;
+        return this;
+    }
+
+    /**
+     * Get uRI of MSDeploy Parameters file. Must not be set if SetParameters is used.
+     *
+     * @return the setParametersXmlFileUri value
+     */
+    public String setParametersXmlFileUri() {
+        return this.setParametersXmlFileUri;
+    }
+
+    /**
+     * Set uRI of MSDeploy Parameters file. Must not be set if SetParameters is used.
+     *
+     * @param setParametersXmlFileUri the setParametersXmlFileUri value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSetParametersXmlFileUri(String setParametersXmlFileUri) {
+        this.setParametersXmlFileUri = setParametersXmlFileUri;
+        return this;
+    }
+
+    /**
+     * Get mSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     *
+     * @return the setParameters value
+     */
+    public Map<String, String> setParameters() {
+        return this.setParameters;
+    }
+
+    /**
+     * Set mSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     *
+     * @param setParameters the setParameters value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSetParameters(Map<String, String> setParameters) {
+        this.setParameters = setParameters;
+        return this;
+    }
+
+    /**
+     * Get controls whether the MSDeploy operation skips the App_Data directory.
+     If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory on the destination
+     will not be deleted, and any App_Data directory in the source will be ignored.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @return the skipAppData value
+     */
+    public Boolean skipAppData() {
+        return this.skipAppData;
+    }
+
+    /**
+     * Set controls whether the MSDeploy operation skips the App_Data directory.
+     If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory on the destination
+     will not be deleted, and any App_Data directory in the source will be ignored.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @param skipAppData the skipAppData value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSkipAppData(Boolean skipAppData) {
+        this.skipAppData = skipAppData;
+        return this;
+    }
+
+    /**
+     * Get sets the AppOffline rule while the MSDeploy operation executes.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @return the appOffline value
+     */
+    public Boolean appOffline() {
+        return this.appOffline;
+    }
+
+    /**
+     * Set sets the AppOffline rule while the MSDeploy operation executes.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @param appOffline the appOffline value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withAppOffline(Boolean appOffline) {
+        this.appOffline = appOffline;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployLog.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployLog.java
index a7a64f53cb84..c1a49815f7d0 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployLog.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployLog.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.MSDeployLogInner;
 import java.util.List;
 
 /**
  * Type representing MSDeployLog.
  */
-public interface MSDeployLog extends HasInner<MSDeployLogInner>, HasManager<AppServiceManager> {
+public interface MSDeployLog extends HasInner<MSDeployLogInner>, HasManager<WebManager> {
     /**
      * @return the entries value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployStatus.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployStatus.java
index 6947959a2fba..bb1485b60ca7 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployStatus.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MSDeployStatus.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.MSDeployStatusInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing MSDeployStatus.
  */
-public interface MSDeployStatus extends HasInner<MSDeployStatusInner>, HasManager<AppServiceManager> {
+public interface MSDeployStatus extends HasInner<MSDeployStatusInner>, HasManager<WebManager> {
     /**
      * @return the complete value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MigrateMySqlStatus.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MigrateMySqlStatus.java
index aa4315deb998..15deb9b0693b 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MigrateMySqlStatus.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/MigrateMySqlStatus.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.MigrateMySqlStatusInner;
 
 /**
  * Type representing MigrateMySqlStatus.
  */
-public interface MigrateMySqlStatus extends HasInner<MigrateMySqlStatusInner>, HasManager<AppServiceManager> {
+public interface MigrateMySqlStatus extends HasInner<MigrateMySqlStatusInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/NetworkFeatures.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/NetworkFeatures.java
index 7f954e62055e..01e4e903e10d 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/NetworkFeatures.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/NetworkFeatures.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing NetworkFeatures.
  */
-public interface NetworkFeatures extends HasInner<NetworkFeaturesInner>, Indexable, Refreshable<NetworkFeatures>, HasManager<AppServiceManager> {
+public interface NetworkFeatures extends HasInner<NetworkFeaturesInner>, Indexable, Refreshable<NetworkFeatures>, HasManager<WebManager> {
     /**
      * @return the hybridConnections value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Operation.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Operation.java
index 7858544bd711..7974d517c933 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Operation.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Operation.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.OperationInner;
 import org.joda.time.DateTime;
 import java.util.List;
@@ -19,7 +19,7 @@
 /**
  * Type representing Operation.
  */
-public interface Operation extends HasInner<OperationInner>, HasManager<AppServiceManager> {
+public interface Operation extends HasInner<OperationInner>, HasManager<WebManager> {
     /**
      * @return the createdTime value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PerfMonResponse.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PerfMonResponse.java
index 9eb056d6c548..ec6e1fbfeb16 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PerfMonResponse.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PerfMonResponse.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.PerfMonResponseInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing PerfMonResponse.
  */
-public interface PerfMonResponse extends HasInner<PerfMonResponseInner>, HasManager<AppServiceManager> {
+public interface PerfMonResponse extends HasInner<PerfMonResponseInner>, HasManager<WebManager> {
     /**
      * @return the code value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PremierAddOn.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PremierAddOn.java
index c8234ee7ad80..2af061683587 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PremierAddOn.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PremierAddOn.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.Map;
 
 /**
  * Type representing PremierAddOn.
  */
-public interface PremierAddOn extends HasInner<PremierAddOnInner>, Indexable, Refreshable<PremierAddOn>, Updatable<PremierAddOn.Update>, HasManager<AppServiceManager> {
+public interface PremierAddOn extends HasInner<PremierAddOnInner>, Indexable, Refreshable<PremierAddOn>, Updatable<PremierAddOn.Update>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessInfo.java
index bbf74377b547..7ba45c8bd7be 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessInfo.java
@@ -13,7 +13,7 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
@@ -21,7 +21,7 @@
 /**
  * Type representing ProcessInfo.
  */
-public interface ProcessInfo extends HasInner<ProcessInfoInner>, Indexable, Refreshable<ProcessInfo>, HasManager<AppServiceManager> {
+public interface ProcessInfo extends HasInner<ProcessInfoInner>, Indexable, Refreshable<ProcessInfo>, HasManager<WebManager> {
     /**
      * @return the children value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessModuleInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessModuleInfo.java
index 263dfddfaacd..94092f3a15e8 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessModuleInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessModuleInfo.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing ProcessModuleInfo.
  */
-public interface ProcessModuleInfo extends HasInner<ProcessModuleInfoInner>, Indexable, Refreshable<ProcessModuleInfo>, HasManager<AppServiceManager> {
+public interface ProcessModuleInfo extends HasInner<ProcessModuleInfoInner>, Indexable, Refreshable<ProcessModuleInfo>, HasManager<WebManager> {
     /**
      * @return the baseAddress value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessThreadInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessThreadInfo.java
index 1858a6534cdb..67ecfb227fc1 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessThreadInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ProcessThreadInfo.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing ProcessThreadInfo.
  */
-public interface ProcessThreadInfo extends HasInner<ProcessThreadInfoInner>, Indexable, Refreshable<ProcessThreadInfo>, HasManager<AppServiceManager> {
+public interface ProcessThreadInfo extends HasInner<ProcessThreadInfoInner>, Indexable, Refreshable<ProcessThreadInfo>, HasManager<WebManager> {
     /**
      * @return the basePriority value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PublicCertificate.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PublicCertificate.java
index 548d7bd61796..09ccf2092e66 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PublicCertificate.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PublicCertificate.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing PublicCertificate.
  */
-public interface PublicCertificate extends HasInner<PublicCertificateInner>, Indexable, Refreshable<PublicCertificate>, Updatable<PublicCertificate.Update>, HasManager<AppServiceManager> {
+public interface PublicCertificate extends HasInner<PublicCertificateInner>, Indexable, Refreshable<PublicCertificate>, Updatable<PublicCertificate.Update>, HasManager<WebManager> {
     /**
      * @return the blob value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PushSettings.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PushSettings.java
index 0d9a7cb9abee..14b6b0e38f25 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PushSettings.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/PushSettings.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.PushSettingsInner;
 
 /**
  * Type representing PushSettings.
  */
-public interface PushSettings extends HasInner<PushSettingsInner>, HasManager<AppServiceManager> {
+public interface PushSettings extends HasInner<PushSettingsInner>, HasManager<WebManager> {
     /**
      * @return the dynamicTagsJson value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RelayServiceConnectionEntity.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RelayServiceConnectionEntity.java
index 48f915ca0e6b..14c463b6d117 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RelayServiceConnectionEntity.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RelayServiceConnectionEntity.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.RelayServiceConnectionEntityInner;
 
 /**
  * Type representing RelayServiceConnectionEntity.
  */
-public interface RelayServiceConnectionEntity extends HasInner<RelayServiceConnectionEntityInner>, HasManager<AppServiceManager> {
+public interface RelayServiceConnectionEntity extends HasInner<RelayServiceConnectionEntityInner>, HasManager<WebManager> {
     /**
      * @return the biztalkUri value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetric.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetric.java
index 87e3f0ad898e..47dabde2bfd6 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetric.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing ResourceMetric.
  */
-public interface ResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface ResourceMetric extends HasInner<ResourceMetricInner>, HasManager<WebManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetricDefinition.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetricDefinition.java
index f64d6c84c07a..a0ab34199c86 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetricDefinition.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/ResourceMetricDefinition.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.ResourceMetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Type representing ResourceMetricDefinition.
  */
-public interface ResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface ResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreRequest.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreRequest.java
index 3e9952afa2f1..d573f971ee54 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreRequest.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreRequest.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.RestoreRequestInner;
 import java.util.List;
 
 /**
  * Type representing RestoreRequest.
  */
-public interface RestoreRequest extends HasInner<RestoreRequestInner>, HasManager<AppServiceManager> {
+public interface RestoreRequest extends HasInner<RestoreRequestInner>, HasManager<WebManager> {
     /**
      * @return the adjustConnectionStrings value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreResponse.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreResponse.java
index 386674ac0889..683c9d02bb0d 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreResponse.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/RestoreResponse.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.RestoreResponseInner;
 
 /**
  * Type representing RestoreResponse.
  */
-public interface RestoreResponse extends HasInner<RestoreResponseInner>, HasManager<AppServiceManager> {
+public interface RestoreResponse extends HasInner<RestoreResponseInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteAuthSettings.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteAuthSettings.java
index e21f8a3c9730..a5ed04b7b81f 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteAuthSettings.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteAuthSettings.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteAuthSettingsInner;
 import java.util.List;
 
 /**
  * Type representing SiteAuthSettings.
  */
-public interface SiteAuthSettings extends HasInner<SiteAuthSettingsInner>, HasManager<AppServiceManager> {
+public interface SiteAuthSettings extends HasInner<SiteAuthSettingsInner>, HasManager<WebManager> {
     /**
      * @return the additionalLoginParams value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteCloneability.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteCloneability.java
index 5c1f0d16fd06..b4862e5657b9 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteCloneability.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteCloneability.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteCloneabilityInner;
 import java.util.List;
 
 /**
  * Type representing SiteCloneability.
  */
-public interface SiteCloneability extends HasInner<SiteCloneabilityInner>, HasManager<AppServiceManager> {
+public interface SiteCloneability extends HasInner<SiteCloneabilityInner>, HasManager<WebManager> {
     /**
      * @return the blockingCharacteristics value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigResource.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigResource.java
index b2e629cfa010..54b0ef821de5 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigResource.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigResource.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteConfigResourceInner;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.PushSettingsInner;
@@ -19,7 +19,7 @@
 /**
  * Type representing SiteConfigResource.
  */
-public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, HasManager<AppServiceManager> {
+public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, HasManager<WebManager> {
     /**
      * @return the alwaysOn value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigurationSnapshotInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigurationSnapshotInfo.java
index 1d3ad3e7eb19..3210d518b571 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigurationSnapshotInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteConfigurationSnapshotInfo.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteConfigurationSnapshotInfoInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteConfigurationSnapshotInfo.
  */
-public interface SiteConfigurationSnapshotInfo extends HasInner<SiteConfigurationSnapshotInfoInner>, HasManager<AppServiceManager> {
+public interface SiteConfigurationSnapshotInfo extends HasInner<SiteConfigurationSnapshotInfoInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteExtensionInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteExtensionInfo.java
index 65e2e3279511..f256482367dd 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteExtensionInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteExtensionInfo.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteExtensionInfo.
  */
-public interface SiteExtensionInfo extends HasInner<SiteExtensionInfoInner>, Indexable, Refreshable<SiteExtensionInfo>, Updatable<SiteExtensionInfo.Update>, HasManager<AppServiceManager> {
+public interface SiteExtensionInfo extends HasInner<SiteExtensionInfoInner>, Indexable, Refreshable<SiteExtensionInfo>, Updatable<SiteExtensionInfo.Update>, HasManager<WebManager> {
     /**
      * @return the authors value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteInstance.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteInstance.java
index fa429d116537..89d845a6b8e6 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteInstance.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteInstance.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteInstanceInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing SiteInstance.
  */
-public interface SiteInstance extends HasInner<SiteInstanceInner>, HasManager<AppServiceManager> {
+public interface SiteInstance extends HasInner<SiteInstanceInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteLogsConfig.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteLogsConfig.java
index e24e7cc07f07..5193377de47a 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteLogsConfig.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteLogsConfig.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteLogsConfigInner;
 
 /**
  * Type representing SiteLogsConfig.
  */
-public interface SiteLogsConfig extends HasInner<SiteLogsConfigInner>, HasManager<AppServiceManager> {
+public interface SiteLogsConfig extends HasInner<SiteLogsConfigInner>, HasManager<WebManager> {
     /**
      * @return the applicationLogs value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SitePhpErrorLogFlag.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SitePhpErrorLogFlag.java
index 41838f90aca2..db8127772738 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SitePhpErrorLogFlag.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SitePhpErrorLogFlag.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SitePhpErrorLogFlagInner;
 
 /**
  * Type representing SitePhpErrorLogFlag.
  */
-public interface SitePhpErrorLogFlag extends HasInner<SitePhpErrorLogFlagInner>, HasManager<AppServiceManager> {
+public interface SitePhpErrorLogFlag extends HasInner<SitePhpErrorLogFlagInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteSourceControl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteSourceControl.java
index 9b72903f2a5c..99e129576204 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteSourceControl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SiteSourceControl.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteSourceControlInner;
 
 /**
  * Type representing SiteSourceControl.
  */
-public interface SiteSourceControl extends HasInner<SiteSourceControlInner>, HasManager<AppServiceManager> {
+public interface SiteSourceControl extends HasInner<SiteSourceControlInner>, HasManager<WebManager> {
     /**
      * @return the branch value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Sites.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Sites.java
index 1a469c2994f8..3f4071e5f114 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Sites.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Sites.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SiteInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Sites.
  */
-public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceCore<AppServiceManager, SiteInner>, HasResourceGroup, Refreshable<Sites>, Updatable<Sites.Update>, HasManager<AppServiceManager> {
+public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceCore<WebManager, SiteInner>, HasResourceGroup, Refreshable<Sites>, Updatable<Sites.Update>, HasManager<WebManager> {
     /**
      * @return the availabilityState value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotConfigNamesResource.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotConfigNamesResource.java
index a967192061c2..dc14ed98a716 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotConfigNamesResource.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotConfigNamesResource.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SlotConfigNamesResourceInner;
 import java.util.List;
 
 /**
  * Type representing SlotConfigNamesResource.
  */
-public interface SlotConfigNamesResource extends HasInner<SlotConfigNamesResourceInner>, HasManager<AppServiceManager> {
+public interface SlotConfigNamesResource extends HasInner<SlotConfigNamesResourceInner>, HasManager<WebManager> {
     /**
      * @return the appSettingNames value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotDifference.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotDifference.java
index df3438aa4bbb..b8b870b765a2 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotDifference.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/SlotDifference.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SlotDifferenceInner;
 
 /**
  * Type representing SlotDifference.
  */
-public interface SlotDifference extends HasInner<SlotDifferenceInner>, HasManager<AppServiceManager> {
+public interface SlotDifference extends HasInner<SlotDifferenceInner>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Slots.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Slots.java
index 0052510e20f4..745f491b6c81 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Slots.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Slots.java
@@ -16,7 +16,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -24,7 +24,7 @@
 /**
  * Type representing Slots.
  */
-public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots>, Updatable<Slots.Update>, HasManager<AppServiceManager> {
+public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots>, Updatable<Slots.Update>, HasManager<WebManager> {
     /**
      * @return the availabilityState value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Snapshot.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Snapshot.java
index 3e1c9de04259..8bb983668095 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Snapshot.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/Snapshot.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.SnapshotInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing Snapshot.
  */
-public interface Snapshot extends HasInner<SnapshotInner>, HasManager<AppServiceManager> {
+public interface Snapshot extends HasInner<SnapshotInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StorageMigrationResponse.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StorageMigrationResponse.java
index 4844a692efb1..657cb0514536 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StorageMigrationResponse.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StorageMigrationResponse.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.StorageMigrationResponseInner;
 
 /**
  * Type representing StorageMigrationResponse.
  */
-public interface StorageMigrationResponse extends HasInner<StorageMigrationResponseInner>, HasManager<AppServiceManager> {
+public interface StorageMigrationResponse extends HasInner<StorageMigrationResponseInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StringDictionary.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StringDictionary.java
index 1a54ad9b2fa9..01b5aaed44c0 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StringDictionary.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/StringDictionary.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.StringDictionaryInner;
 import java.util.Map;
 
 /**
  * Type representing StringDictionary.
  */
-public interface StringDictionary extends HasInner<StringDictionaryInner>, HasManager<AppServiceManager> {
+public interface StringDictionary extends HasInner<StringDictionaryInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredJobHistory.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredJobHistory.java
index 724ab37e91a5..765600fa0bef 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredJobHistory.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredJobHistory.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.TriggeredJobHistoryInner;
 import java.util.List;
 
 /**
  * Type representing TriggeredJobHistory.
  */
-public interface TriggeredJobHistory extends HasInner<TriggeredJobHistoryInner>, HasManager<AppServiceManager> {
+public interface TriggeredJobHistory extends HasInner<TriggeredJobHistoryInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredWebJob.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredWebJob.java
index 83f615863a92..a5fa6ac9bb55 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredWebJob.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/TriggeredWebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.Map;
 
 /**
  * Type representing TriggeredWebJob.
  */
-public interface TriggeredWebJob extends HasInner<TriggeredWebJobInner>, Indexable, Refreshable<TriggeredWebJob>, HasManager<AppServiceManager> {
+public interface TriggeredWebJob extends HasInner<TriggeredWebJobInner>, Indexable, Refreshable<TriggeredWebJob>, HasManager<WebManager> {
     /**
      * @return the error value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/User.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/User.java
index 693271c7d4df..982d879f9adb 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/User.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/User.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_08_01.implementation.UserInner;
 
 /**
  * Type representing User.
  */
-public interface User extends HasInner<UserInner>, HasManager<AppServiceManager> {
+public interface User extends HasInner<UserInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetGateway.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetGateway.java
index cc1357a22550..750e751d222c 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetGateway.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetGateway.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 
 /**
  * Type representing VnetGateway.
  */
-public interface VnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<VnetGateway>, Updatable<VnetGateway.Update>, HasManager<AppServiceManager> {
+public interface VnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<VnetGateway>, Updatable<VnetGateway.Update>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetInfo.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetInfo.java
index f0e50b36ffd4..93fea40510d4 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetInfo.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/VnetInfo.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing VnetInfo.
  */
-public interface VnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<VnetInfo>, Updatable<VnetInfo.Update>, HasManager<AppServiceManager> {
+public interface VnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<VnetInfo>, Updatable<VnetInfo.Update>, HasManager<WebManager> {
     /**
      * @return the certBlob value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/WebJob.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/WebJob.java
index 0787d0e3b6c6..ff2cb1ffb6c3 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/WebJob.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/WebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_08_01.implementation.WebManager;
 import java.util.Map;
 
 /**
  * Type representing WebJob.
  */
-public interface WebJob extends HasInner<WebJobInner>, Indexable, Refreshable<WebJob>, HasManager<AppServiceManager> {
+public interface WebJob extends HasInner<WebJobInner>, Indexable, Refreshable<WebJob>, HasManager<WebManager> {
     /**
      * @return the error value.
      */
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupItemImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupItemImpl.java
index fc752212eb3c..259cce287898 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupItemImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupItemImpl.java
@@ -17,12 +17,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.BackupItemStatus;
 
 class BackupItemImpl extends IndexableRefreshableWrapperImpl<BackupItem, BackupItemInner> implements BackupItem {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String backupId;
 
-    BackupItemImpl(BackupItemInner inner,  AppServiceManager manager) {
+    BackupItemImpl(BackupItemInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class BackupItemImpl extends IndexableRefreshableWrapperImpl<BackupItem, BackupI
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupRequestImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupRequestImpl.java
index b8f36034f435..a3de793755f4 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupRequestImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/BackupRequestImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.DatabaseBackupSetting;
 
 class BackupRequestImpl extends WrapperImpl<BackupRequestInner> implements BackupRequest {
-    private final AppServiceManager manager;
-    BackupRequestImpl(BackupRequestInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    BackupRequestImpl(BackupRequestInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ConnectionStringDictionaryImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ConnectionStringDictionaryImpl.java
index ef2e71e82ebe..7c0cddd04b34 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ConnectionStringDictionaryImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ConnectionStringDictionaryImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ConnStringValueTypePair;
 
 class ConnectionStringDictionaryImpl extends WrapperImpl<ConnectionStringDictionaryInner> implements ConnectionStringDictionary {
-    private final AppServiceManager manager;
-    ConnectionStringDictionaryImpl(ConnectionStringDictionaryInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    ConnectionStringDictionaryImpl(ConnectionStringDictionaryInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ContinuousWebJobImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ContinuousWebJobImpl.java
index bc7cdda6778f..c833557e73ba 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ContinuousWebJobImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ContinuousWebJobImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ContinuousWebJobStatus;
 
 class ContinuousWebJobImpl extends IndexableRefreshableWrapperImpl<ContinuousWebJob, ContinuousWebJobInner> implements ContinuousWebJob {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
 
-    ContinuousWebJobImpl(ContinuousWebJobInner inner,  AppServiceManager manager) {
+    ContinuousWebJobImpl(ContinuousWebJobInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -30,7 +30,7 @@ class ContinuousWebJobImpl extends IndexableRefreshableWrapperImpl<ContinuousWeb
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CsmUsageQuotaImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CsmUsageQuotaImpl.java
index 16c50674d2c5..c1f548b90f25 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CsmUsageQuotaImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CsmUsageQuotaImpl.java
@@ -15,15 +15,15 @@
 import org.joda.time.DateTime;
 
 class CsmUsageQuotaImpl extends WrapperImpl<CsmUsageQuotaInner> implements CsmUsageQuota {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    CsmUsageQuotaImpl(CsmUsageQuotaInner inner,  AppServiceManager manager) {
+    CsmUsageQuotaImpl(CsmUsageQuotaInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CustomHostnameAnalysisResultImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CustomHostnameAnalysisResultImpl.java
index be476e0aeefd..791c7f3bc31e 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CustomHostnameAnalysisResultImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/CustomHostnameAnalysisResultImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.DnsVerificationTestResult;
 
 class CustomHostnameAnalysisResultImpl extends WrapperImpl<CustomHostnameAnalysisResultInner> implements CustomHostnameAnalysisResult {
-    private final AppServiceManager manager;
-    CustomHostnameAnalysisResultImpl(CustomHostnameAnalysisResultInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    CustomHostnameAnalysisResultImpl(CustomHostnameAnalysisResultInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/DeploymentImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/DeploymentImpl.java
index 180ff7775d0b..c899f6fdd5ed 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/DeploymentImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/DeploymentImpl.java
@@ -14,12 +14,12 @@
 import org.joda.time.DateTime;
 
 class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner, DeploymentImpl> implements Deployment, Deployment.Definition, Deployment.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String id;
 
-    DeploymentImpl(String name, AppServiceManager manager) {
+    DeploymentImpl(String name, WebManager manager) {
         super(name, new DeploymentInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner,
         //
     }
 
-    DeploymentImpl(DeploymentInner inner, AppServiceManager manager) {
+    DeploymentImpl(DeploymentInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner,
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionEnvelopeImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionEnvelopeImpl.java
index 47fbdde757a7..42fdca3cc648 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionEnvelopeImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionEnvelopeImpl.java
@@ -14,12 +14,12 @@
 import java.util.Map;
 
 class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, FunctionEnvelopeInner, FunctionEnvelopeImpl> implements FunctionEnvelope, FunctionEnvelope.Definition, FunctionEnvelope.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String functionName;
 
-    FunctionEnvelopeImpl(String name, AppServiceManager manager) {
+    FunctionEnvelopeImpl(String name, WebManager manager) {
         super(name, new FunctionEnvelopeInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, Func
         //
     }
 
-    FunctionEnvelopeImpl(FunctionEnvelopeInner inner, AppServiceManager manager) {
+    FunctionEnvelopeImpl(FunctionEnvelopeInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, Func
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionSecretsImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionSecretsImpl.java
index 297170311411..416ac0919ad7 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionSecretsImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/FunctionSecretsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class FunctionSecretsImpl extends WrapperImpl<FunctionSecretsInner> implements FunctionSecrets {
-    private final AppServiceManager manager;
-    FunctionSecretsImpl(FunctionSecretsInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    FunctionSecretsImpl(FunctionSecretsInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HostNameBindingImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HostNameBindingImpl.java
index 536de0d98e7e..c3b060ebe2e0 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HostNameBindingImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HostNameBindingImpl.java
@@ -17,12 +17,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.SslState;
 
 class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNameBindingInner, HostNameBindingImpl> implements HostNameBinding, HostNameBinding.Definition, HostNameBinding.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String hostName;
 
-    HostNameBindingImpl(String name, AppServiceManager manager) {
+    HostNameBindingImpl(String name, WebManager manager) {
         super(name, new HostNameBindingInner());
         this.manager = manager;
         // Set resource name
@@ -30,7 +30,7 @@ class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNa
         //
     }
 
-    HostNameBindingImpl(HostNameBindingInner inner, AppServiceManager manager) {
+    HostNameBindingImpl(HostNameBindingInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -43,7 +43,7 @@ class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNa
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionImpl.java
index 32053aa6c84b..a953c454b183 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class HybridConnectionImpl extends CreatableUpdatableImpl<HybridConnection, HybridConnectionInner, HybridConnectionImpl> implements HybridConnection, HybridConnection.Definition, HybridConnection.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String namespaceName;
     private String relayName;
 
-    HybridConnectionImpl(String name, AppServiceManager manager) {
+    HybridConnectionImpl(String name, WebManager manager) {
         super(name, new HybridConnectionInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class HybridConnectionImpl extends CreatableUpdatableImpl<HybridConnection, Hybr
         //
     }
 
-    HybridConnectionImpl(HybridConnectionInner inner, AppServiceManager manager) {
+    HybridConnectionImpl(HybridConnectionInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -41,7 +41,7 @@ class HybridConnectionImpl extends CreatableUpdatableImpl<HybridConnection, Hybr
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionKeyImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionKeyImpl.java
index 44a2653045f0..0cfec432f07b 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionKeyImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/HybridConnectionKeyImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class HybridConnectionKeyImpl extends WrapperImpl<HybridConnectionKeyInner> implements HybridConnectionKey {
-    private final AppServiceManager manager;
-    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/IdentifierImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/IdentifierImpl.java
index 4e52bbdf960d..cd1ed96c8b34 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/IdentifierImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/IdentifierImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner, IdentifierImpl> implements Identifier, Identifier.Definition, Identifier.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String domainOwnershipIdentifierName;
 
-    IdentifierImpl(String name, AppServiceManager manager) {
+    IdentifierImpl(String name, WebManager manager) {
         super(name, new IdentifierInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner,
         //
     }
 
-    IdentifierImpl(IdentifierInner inner, AppServiceManager manager) {
+    IdentifierImpl(IdentifierInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner,
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployLogImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployLogImpl.java
index 2e8d8abcf417..bb8a2dadde9f 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployLogImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployLogImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.MSDeployLogEntry;
 
 class MSDeployLogImpl extends WrapperImpl<MSDeployLogInner> implements MSDeployLog {
-    private final AppServiceManager manager;
-    MSDeployLogImpl(MSDeployLogInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    MSDeployLogImpl(MSDeployLogInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployStatusImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployStatusImpl.java
index 1c74e84f3af8..c1f6b6e08f73 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployStatusImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MSDeployStatusImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.MSDeployProvisioningState;
 
 class MSDeployStatusImpl extends WrapperImpl<MSDeployStatusInner> implements MSDeployStatus {
-    private final AppServiceManager manager;
-    MSDeployStatusImpl(MSDeployStatusInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    MSDeployStatusImpl(MSDeployStatusInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MigrateMySqlStatusImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MigrateMySqlStatusImpl.java
index 1f26e4c7486a..63cceea8d422 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MigrateMySqlStatusImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/MigrateMySqlStatusImpl.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.OperationStatus;
 
 class MigrateMySqlStatusImpl extends WrapperImpl<MigrateMySqlStatusInner> implements MigrateMySqlStatus {
-    private final AppServiceManager manager;
-    MigrateMySqlStatusImpl(MigrateMySqlStatusInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    MigrateMySqlStatusImpl(MigrateMySqlStatusInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/NetworkFeaturesImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/NetworkFeaturesImpl.java
index c772338567ee..7fe261435241 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/NetworkFeaturesImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/NetworkFeaturesImpl.java
@@ -18,12 +18,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.VnetInfo;
 
 class NetworkFeaturesImpl extends IndexableRefreshableWrapperImpl<NetworkFeatures, NetworkFeaturesInner> implements NetworkFeatures {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String view;
 
-    NetworkFeaturesImpl(NetworkFeaturesInner inner,  AppServiceManager manager) {
+    NetworkFeaturesImpl(NetworkFeaturesInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class NetworkFeaturesImpl extends IndexableRefreshableWrapperImpl<NetworkFeature
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/OperationImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/OperationImpl.java
index fd08492da094..ecaaa869ebd4 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/OperationImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/OperationImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.OperationStatus;
 
 class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
-    private final AppServiceManager manager;
-    OperationImpl(OperationInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    OperationImpl(OperationInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PerfMonResponseImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PerfMonResponseImpl.java
index bf4a805db3cf..5e7cc987c134 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PerfMonResponseImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PerfMonResponseImpl.java
@@ -14,15 +14,15 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.PerfMonSet;
 
 class PerfMonResponseImpl extends WrapperImpl<PerfMonResponseInner> implements PerfMonResponse {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    PerfMonResponseImpl(PerfMonResponseInner inner,  AppServiceManager manager) {
+    PerfMonResponseImpl(PerfMonResponseInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PremierAddOnImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PremierAddOnImpl.java
index c753c83f69ec..916179a9bf11 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PremierAddOnImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PremierAddOnImpl.java
@@ -14,12 +14,12 @@
 import java.util.Map;
 
 class PremierAddOnImpl extends CreatableUpdatableImpl<PremierAddOn, PremierAddOnInner, PremierAddOnImpl> implements PremierAddOn, PremierAddOn.Definition, PremierAddOn.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String premierAddOnName;
 
-    PremierAddOnImpl(String name, AppServiceManager manager) {
+    PremierAddOnImpl(String name, WebManager manager) {
         super(name, new PremierAddOnInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class PremierAddOnImpl extends CreatableUpdatableImpl<PremierAddOn, PremierAddOn
         //
     }
 
-    PremierAddOnImpl(PremierAddOnInner inner, AppServiceManager manager) {
+    PremierAddOnImpl(PremierAddOnInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class PremierAddOnImpl extends CreatableUpdatableImpl<PremierAddOn, PremierAddOn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessInfoImpl.java
index 4c74d2c1d64c..396ca6616baa 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessInfoImpl.java
@@ -19,13 +19,13 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ProcessThreadInfo;
 
 class ProcessInfoImpl extends IndexableRefreshableWrapperImpl<ProcessInfo, ProcessInfoInner> implements ProcessInfo {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String instanceId;
 
-    ProcessInfoImpl(ProcessInfoInner inner,  AppServiceManager manager) {
+    ProcessInfoImpl(ProcessInfoInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -35,7 +35,7 @@ class ProcessInfoImpl extends IndexableRefreshableWrapperImpl<ProcessInfo, Proce
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessModuleInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessModuleInfoImpl.java
index b64da7e2fdd7..8d8f1f5acf7a 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessModuleInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessModuleInfoImpl.java
@@ -13,14 +13,14 @@
 import rx.Observable;
 
 class ProcessModuleInfoImpl extends IndexableRefreshableWrapperImpl<ProcessModuleInfo, ProcessModuleInfoInner> implements ProcessModuleInfo {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String baseAddress;
     private String instanceId;
 
-    ProcessModuleInfoImpl(ProcessModuleInfoInner inner,  AppServiceManager manager) {
+    ProcessModuleInfoImpl(ProcessModuleInfoInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class ProcessModuleInfoImpl extends IndexableRefreshableWrapperImpl<ProcessModul
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessThreadInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessThreadInfoImpl.java
index 4c962b8b743d..cc35be928085 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessThreadInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ProcessThreadInfoImpl.java
@@ -14,14 +14,14 @@
 import org.joda.time.DateTime;
 
 class ProcessThreadInfoImpl extends IndexableRefreshableWrapperImpl<ProcessThreadInfo, ProcessThreadInfoInner> implements ProcessThreadInfo {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String threadId;
     private String instanceId;
 
-    ProcessThreadInfoImpl(ProcessThreadInfoInner inner,  AppServiceManager manager) {
+    ProcessThreadInfoImpl(ProcessThreadInfoInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class ProcessThreadInfoImpl extends IndexableRefreshableWrapperImpl<ProcessThrea
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PublicCertificateImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PublicCertificateImpl.java
index f5ea0cff74dd..10d70590ea8a 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PublicCertificateImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PublicCertificateImpl.java
@@ -14,12 +14,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.PublicCertificateLocation;
 
 class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, PublicCertificateInner, PublicCertificateImpl> implements PublicCertificate, PublicCertificate.Definition, PublicCertificate.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String publicCertificateName;
 
-    PublicCertificateImpl(String name, AppServiceManager manager) {
+    PublicCertificateImpl(String name, WebManager manager) {
         super(name, new PublicCertificateInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, Pu
         //
     }
 
-    PublicCertificateImpl(PublicCertificateInner inner, AppServiceManager manager) {
+    PublicCertificateImpl(PublicCertificateInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, Pu
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PushSettingsImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PushSettingsImpl.java
index ede51eb51a37..f5e5da2eb0f9 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PushSettingsImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/PushSettingsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class PushSettingsImpl extends WrapperImpl<PushSettingsInner> implements PushSettings {
-    private final AppServiceManager manager;
-    PushSettingsImpl(PushSettingsInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    PushSettingsImpl(PushSettingsInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RelayServiceConnectionEntityImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RelayServiceConnectionEntityImpl.java
index 26beb5a7f011..c3c03b64218d 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RelayServiceConnectionEntityImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RelayServiceConnectionEntityImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class RelayServiceConnectionEntityImpl extends WrapperImpl<RelayServiceConnectionEntityInner> implements RelayServiceConnectionEntity {
-    private final AppServiceManager manager;
-    RelayServiceConnectionEntityImpl(RelayServiceConnectionEntityInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    RelayServiceConnectionEntityImpl(RelayServiceConnectionEntityInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricDefinitionImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricDefinitionImpl.java
index 5f123f5131b6..c875ea59f6fc 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricDefinitionImpl.java
@@ -17,15 +17,15 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ResourceMetricName;
 
 class ResourceMetricDefinitionImpl extends WrapperImpl<ResourceMetricDefinitionInner> implements ResourceMetricDefinition {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  AppServiceManager manager) {
+    ResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricImpl.java
index 9b02f8bb691a..aa2aa9577a17 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/ResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ResourceMetricProperty;
 
 class ResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements ResourceMetric {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    ResourceMetricImpl(ResourceMetricInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreRequestImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreRequestImpl.java
index 4910eeff0d89..62f426fdab35 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreRequestImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreRequestImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.BackupRestoreOperationType;
 
 class RestoreRequestImpl extends WrapperImpl<RestoreRequestInner> implements RestoreRequest {
-    private final AppServiceManager manager;
-    RestoreRequestImpl(RestoreRequestInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    RestoreRequestImpl(RestoreRequestInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreResponseImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreResponseImpl.java
index c29d81ad57c4..4db2303d238c 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreResponseImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/RestoreResponseImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class RestoreResponseImpl extends WrapperImpl<RestoreResponseInner> implements RestoreResponse {
-    private final AppServiceManager manager;
-    RestoreResponseImpl(RestoreResponseInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    RestoreResponseImpl(RestoreResponseInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteAuthSettingsImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteAuthSettingsImpl.java
index 96eea08a88c6..458fbbbb50a5 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteAuthSettingsImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteAuthSettingsImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.UnauthenticatedClientAction;
 
 class SiteAuthSettingsImpl extends WrapperImpl<SiteAuthSettingsInner> implements SiteAuthSettings {
-    private final AppServiceManager manager;
-    SiteAuthSettingsImpl(SiteAuthSettingsInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteAuthSettingsImpl(SiteAuthSettingsInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteCloneabilityImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteCloneabilityImpl.java
index f5c69e2c57cc..08540054cfc8 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteCloneabilityImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteCloneabilityImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.CloneAbilityResult;
 
 class SiteCloneabilityImpl extends WrapperImpl<SiteCloneabilityInner> implements SiteCloneability {
-    private final AppServiceManager manager;
-    SiteCloneabilityImpl(SiteCloneabilityInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteCloneabilityImpl(SiteCloneabilityInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigResourceImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigResourceImpl.java
index 95023a99482b..71a443c23f97 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigResourceImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigResourceImpl.java
@@ -29,14 +29,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.VirtualApplication;
 
 class SiteConfigResourceImpl extends WrapperImpl<SiteConfigResourceInner> implements SiteConfigResource {
-    private final AppServiceManager manager;
-    SiteConfigResourceImpl(SiteConfigResourceInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteConfigResourceImpl(SiteConfigResourceInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigurationSnapshotInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigurationSnapshotInfoImpl.java
index 38c3faa25937..d40bc15aac8f 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigurationSnapshotInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteConfigurationSnapshotInfoImpl.java
@@ -13,14 +13,14 @@
 import org.joda.time.DateTime;
 
 class SiteConfigurationSnapshotInfoImpl extends WrapperImpl<SiteConfigurationSnapshotInfoInner> implements SiteConfigurationSnapshotInfo {
-    private final AppServiceManager manager;
-    SiteConfigurationSnapshotInfoImpl(SiteConfigurationSnapshotInfoInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteConfigurationSnapshotInfoImpl(SiteConfigurationSnapshotInfoInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteExtensionInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteExtensionInfoImpl.java
index 6b4fbfc36955..9038bfb26c52 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteExtensionInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteExtensionInfoImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.SiteExtensionType;
 
 class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, SiteExtensionInfoInner, SiteExtensionInfoImpl> implements SiteExtensionInfo, SiteExtensionInfo.Definition, SiteExtensionInfo.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String siteExtensionId;
 
-    SiteExtensionInfoImpl(String name, AppServiceManager manager) {
+    SiteExtensionInfoImpl(String name, WebManager manager) {
         super(name, new SiteExtensionInfoInner());
         this.manager = manager;
         // Set resource name
@@ -29,7 +29,7 @@ class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, Si
         //
     }
 
-    SiteExtensionInfoImpl(SiteExtensionInfoInner inner, AppServiceManager manager) {
+    SiteExtensionInfoImpl(SiteExtensionInfoInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, Si
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteInstanceImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteInstanceImpl.java
index c86f28cb27a6..c33f3097b3b4 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteInstanceImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteInstanceImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class SiteInstanceImpl extends WrapperImpl<SiteInstanceInner> implements SiteInstance {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    SiteInstanceImpl(SiteInstanceInner inner,  AppServiceManager manager) {
+    SiteInstanceImpl(SiteInstanceInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteLogsConfigImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteLogsConfigImpl.java
index 49ee3b80b888..7d2318793dfb 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteLogsConfigImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteLogsConfigImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.HttpLogsConfig;
 
 class SiteLogsConfigImpl extends WrapperImpl<SiteLogsConfigInner> implements SiteLogsConfig {
-    private final AppServiceManager manager;
-    SiteLogsConfigImpl(SiteLogsConfigInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteLogsConfigImpl(SiteLogsConfigInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitePhpErrorLogFlagImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitePhpErrorLogFlagImpl.java
index 53468659f37e..070179381ff2 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitePhpErrorLogFlagImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitePhpErrorLogFlagImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SitePhpErrorLogFlagImpl extends WrapperImpl<SitePhpErrorLogFlagInner> implements SitePhpErrorLogFlag {
-    private final AppServiceManager manager;
-    SitePhpErrorLogFlagImpl(SitePhpErrorLogFlagInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SitePhpErrorLogFlagImpl(SitePhpErrorLogFlagInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteSourceControlImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteSourceControlImpl.java
index 1e97280b5898..c5d8a48c0512 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteSourceControlImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SiteSourceControlImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SiteSourceControlImpl extends WrapperImpl<SiteSourceControlInner> implements SiteSourceControl {
-    private final AppServiceManager manager;
-    SiteSourceControlImpl(SiteSourceControlInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SiteSourceControlImpl(SiteSourceControlInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitesImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitesImpl.java
index 30f291d0d8ec..fa36cc12998a 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitesImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SitesImpl.java
@@ -25,9 +25,9 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.ManagedServiceIdentity;
 import rx.functions.Func1;
 
-class SitesImpl extends GroupableResourceCoreImpl<Sites, SiteInner, SitesImpl, AppServiceManager> implements Sites, Sites.Definition, Sites.Update {
+class SitesImpl extends GroupableResourceCoreImpl<Sites, SiteInner, SitesImpl, WebManager> implements Sites, Sites.Definition, Sites.Update {
     private SitePatchResource updateParameter;
-    SitesImpl(String name, SiteInner inner, AppServiceManager manager) {
+    SitesImpl(String name, SiteInner inner, WebManager manager) {
         super(name, inner, manager);
         this.updateParameter = new SitePatchResource();
     }
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotConfigNamesResourceImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotConfigNamesResourceImpl.java
index d16706a3503c..4eb5866ce743 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotConfigNamesResourceImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotConfigNamesResourceImpl.java
@@ -13,14 +13,14 @@
 import java.util.List;
 
 class SlotConfigNamesResourceImpl extends WrapperImpl<SlotConfigNamesResourceInner> implements SlotConfigNamesResource {
-    private final AppServiceManager manager;
-    SlotConfigNamesResourceImpl(SlotConfigNamesResourceInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SlotConfigNamesResourceImpl(SlotConfigNamesResourceInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotDifferenceImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotDifferenceImpl.java
index 89dad41abe28..64719b9bf0d1 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotDifferenceImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotDifferenceImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SlotDifferenceImpl extends WrapperImpl<SlotDifferenceInner> implements SlotDifference {
-    private final AppServiceManager manager;
-    SlotDifferenceImpl(SlotDifferenceInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SlotDifferenceImpl(SlotDifferenceInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotsImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotsImpl.java
index 6a5c70afa424..cb45c9085d59 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotsImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SlotsImpl.java
@@ -27,13 +27,13 @@
 import rx.functions.Func1;
 
 class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> implements Slots, Slots.Definition, Slots.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String slot;
     private SitePatchResource updateParameter;
 
-    SlotsImpl(String name, AppServiceManager manager) {
+    SlotsImpl(String name, WebManager manager) {
         super(name, new SiteInner());
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> impl
         this.updateParameter = new SitePatchResource();
     }
 
-    SlotsImpl(SiteInner inner, AppServiceManager manager) {
+    SlotsImpl(SiteInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -56,7 +56,7 @@ class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> impl
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SnapshotImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SnapshotImpl.java
index 7deb2c5df46a..cdd08f284937 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SnapshotImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/SnapshotImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class SnapshotImpl extends WrapperImpl<SnapshotInner> implements Snapshot {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    SnapshotImpl(SnapshotInner inner,  AppServiceManager manager) {
+    SnapshotImpl(SnapshotInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StorageMigrationResponseImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StorageMigrationResponseImpl.java
index 3e1696b08bb6..e885f5400a9b 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StorageMigrationResponseImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StorageMigrationResponseImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class StorageMigrationResponseImpl extends WrapperImpl<StorageMigrationResponseInner> implements StorageMigrationResponse {
-    private final AppServiceManager manager;
-    StorageMigrationResponseImpl(StorageMigrationResponseInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    StorageMigrationResponseImpl(StorageMigrationResponseInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StringDictionaryImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StringDictionaryImpl.java
index a1725dbd1b16..e112b4db73eb 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StringDictionaryImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/StringDictionaryImpl.java
@@ -13,14 +13,14 @@
 import java.util.Map;
 
 class StringDictionaryImpl extends WrapperImpl<StringDictionaryInner> implements StringDictionary {
-    private final AppServiceManager manager;
-    StringDictionaryImpl(StringDictionaryInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    StringDictionaryImpl(StringDictionaryInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredJobHistoryImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredJobHistoryImpl.java
index 85a0a5073347..6ed80496d7b0 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredJobHistoryImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredJobHistoryImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.TriggeredJobRun;
 
 class TriggeredJobHistoryImpl extends WrapperImpl<TriggeredJobHistoryInner> implements TriggeredJobHistory {
-    private final AppServiceManager manager;
-    TriggeredJobHistoryImpl(TriggeredJobHistoryInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    TriggeredJobHistoryImpl(TriggeredJobHistoryInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredWebJobImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredWebJobImpl.java
index f1de8c8ef4dd..0b8dc445a82b 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredWebJobImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/TriggeredWebJobImpl.java
@@ -16,13 +16,13 @@
 import java.util.Map;
 
 class TriggeredWebJobImpl extends IndexableRefreshableWrapperImpl<TriggeredWebJob, TriggeredWebJobInner> implements TriggeredWebJob {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
     private String slot;
 
-    TriggeredWebJobImpl(TriggeredWebJobInner inner,  AppServiceManager manager) {
+    TriggeredWebJobImpl(TriggeredWebJobInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class TriggeredWebJobImpl extends IndexableRefreshableWrapperImpl<TriggeredWebJo
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/UserImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/UserImpl.java
index 219f4261bfed..923203f585df 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/UserImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/UserImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class UserImpl extends WrapperImpl<UserInner> implements User {
-    private final AppServiceManager manager;
-    UserImpl(UserInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    UserImpl(UserInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetGatewayImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetGatewayImpl.java
index 31f1fe16a829..aac3b88bdc9a 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetGatewayImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetGatewayImpl.java
@@ -13,14 +13,14 @@
 import rx.Observable;
 
 class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInner, VnetGatewayImpl> implements VnetGateway, VnetGateway.Definition, VnetGateway.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String gatewayName;
     private String slot;
 
-    VnetGatewayImpl(String name, AppServiceManager manager) {
+    VnetGatewayImpl(String name, WebManager manager) {
         super(name, new VnetGatewayInner());
         this.manager = manager;
         // Set resource name
@@ -28,7 +28,7 @@ class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInn
         //
     }
 
-    VnetGatewayImpl(VnetGatewayInner inner, AppServiceManager manager) {
+    VnetGatewayImpl(VnetGatewayInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -43,7 +43,7 @@ class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetInfoImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetInfoImpl.java
index ca9c61d3e314..ce78d820082e 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetInfoImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/VnetInfoImpl.java
@@ -15,13 +15,13 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.VnetRoute;
 
 class VnetInfoImpl extends CreatableUpdatableImpl<VnetInfo, VnetInfoInner, VnetInfoImpl> implements VnetInfo, VnetInfo.Definition, VnetInfo.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String slot;
 
-    VnetInfoImpl(String name, AppServiceManager manager) {
+    VnetInfoImpl(String name, WebManager manager) {
         super(name, new VnetInfoInner());
         this.manager = manager;
         // Set resource name
@@ -29,7 +29,7 @@ class VnetInfoImpl extends CreatableUpdatableImpl<VnetInfo, VnetInfoInner, VnetI
         //
     }
 
-    VnetInfoImpl(VnetInfoInner inner, AppServiceManager manager) {
+    VnetInfoImpl(VnetInfoInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -43,7 +43,7 @@ class VnetInfoImpl extends CreatableUpdatableImpl<VnetInfo, VnetInfoInner, VnetI
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebAppsImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebAppsImpl.java
index f82525c0d3ae..68922afbd068 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebAppsImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebAppsImpl.java
@@ -75,14 +75,14 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.WebJob;
 
 class WebAppsImpl extends WrapperImpl<WebAppsInner> implements WebApps {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    WebAppsImpl(AppServiceManager manager) {
+    WebAppsImpl(WebManager manager) {
         super(manager.inner().webApps());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebJobImpl.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebJobImpl.java
index ed73c12b1e4e..b112a6f11599 100644
--- a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebJobImpl.java
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebJobImpl.java
@@ -15,13 +15,13 @@
 import java.util.Map;
 
 class WebJobImpl extends IndexableRefreshableWrapperImpl<WebJob, WebJobInner> implements WebJob {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
     private String slot;
 
-    WebJobImpl(WebJobInner inner,  AppServiceManager manager) {
+    WebJobImpl(WebJobInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class WebJobImpl extends IndexableRefreshableWrapperImpl<WebJob, WebJobInner> im
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebManager.java b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebManager.java
new file mode 100644
index 000000000000..6f03dcd18aa3
--- /dev/null
+++ b/appservice/resource-manager/v2016_08_01/src/main/java/com/microsoft/azure/management/appservice/v2016_08_01/implementation/WebManager.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2016_08_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.appservice.v2016_08_01.WebApps;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Web resource management.
+ */
+public final class WebManager extends ManagerCore<WebManager, WebSiteManagementClientImpl> {
+    private WebApps webApps;
+    /**
+    * Get a Configurable instance that can be used to create WebManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new WebManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new WebManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(RestClient restClient, String subscriptionId) {
+        return new WebManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of WebManager that exposes Web management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Web management API entry points that work across subscriptions
+        */
+        WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage WebApps.
+     */
+    public WebApps webApps() {
+        if (this.webApps == null) {
+            this.webApps = new WebAppsImpl(this);
+        }
+        return this.webApps;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return WebManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private WebManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new WebSiteManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/appservice/resource-manager/v2016_09_01/pom.xml b/appservice/resource-manager/v2016_09_01/pom.xml
index 5f7cedf844d1..56305e8a1e1c 100644
--- a/appservice/resource-manager/v2016_09_01/pom.xml
+++ b/appservice/resource-manager/v2016_09_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.appservice.v2016_09_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-appservice</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Web Management</name>
-    <description>This package contains Microsoft Web Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.appservice.v2016_09_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-web</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Web Management</name>
+    <description>This package contains Microsoft Web Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AddressResponse.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AddressResponse.java
index a3b899f9307f..6adba3580330 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AddressResponse.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AddressResponse.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AddressResponseInner;
 import java.util.List;
 
 /**
  * Type representing AddressResponse.
  */
-public interface AddressResponse extends HasInner<AddressResponseInner>, HasManager<AppServiceManager> {
+public interface AddressResponse extends HasInner<AddressResponseInner>, HasManager<WebManager> {
     /**
      * @return the internalIpAddress value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServiceEnvironmentResource.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServiceEnvironmentResource.java
index 6e5b6f715811..7a2d5c2174c8 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServiceEnvironmentResource.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServiceEnvironmentResource.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.StampCapacityInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceEnvironmentResourceInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing AppServiceEnvironmentResource.
  */
-public interface AppServiceEnvironmentResource extends HasInner<AppServiceEnvironmentResourceInner>, Resource, GroupableResourceCore<AppServiceManager, AppServiceEnvironmentResourceInner>, HasResourceGroup, Refreshable<AppServiceEnvironmentResource>, Updatable<AppServiceEnvironmentResource.Update>, HasManager<AppServiceManager> {
+public interface AppServiceEnvironmentResource extends HasInner<AppServiceEnvironmentResourceInner>, Resource, GroupableResourceCore<WebManager, AppServiceEnvironmentResourceInner>, HasResourceGroup, Refreshable<AppServiceEnvironmentResource>, Updatable<AppServiceEnvironmentResource.Update>, HasManager<WebManager> {
     /**
      * @return the allowedMultiSizes value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServicePlan.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServicePlan.java
index 15dcc567dc1b..3462b61dc6ea 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServicePlan.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/AppServicePlan.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServicePlanInner;
 
 /**
  * Type representing AppServicePlan.
  */
-public interface AppServicePlan extends HasInner<AppServicePlanInner>, Resource, GroupableResourceCore<AppServiceManager, AppServicePlanInner>, HasResourceGroup, Refreshable<AppServicePlan>, Updatable<AppServicePlan.Update>, HasManager<AppServiceManager> {
+public interface AppServicePlan extends HasInner<AppServicePlanInner>, Resource, GroupableResourceCore<WebManager, AppServicePlanInner>, HasResourceGroup, Refreshable<AppServicePlan>, Updatable<AppServicePlan.Update>, HasManager<WebManager> {
     /**
      * @return the adminSiteName value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Capability.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Capability.java
index 3d03130217be..45ae6f1c2a6a 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Capability.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Capability.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.CapabilityInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 
 /**
  * Type representing Capability.
  */
-public interface Capability extends HasInner<CapabilityInner>, HasManager<AppServiceManager> {
+public interface Capability extends HasInner<CapabilityInner>, HasManager<WebManager> {
     /**
      * @return the name value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/CsmUsageQuota.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/CsmUsageQuota.java
index 2786e2cea816..781dc9552466 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/CsmUsageQuota.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/CsmUsageQuota.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.CsmUsageQuotaInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing CsmUsageQuota.
  */
-public interface CsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<AppServiceManager> {
+public interface CsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<WebManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentAppServicePlan.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentAppServicePlan.java
index ab93f003b457..0e22beaab1ad 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentAppServicePlan.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentAppServicePlan.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServicePlanInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.Map;
 
 /**
  * Type representing HostingEnvironmentAppServicePlan.
  */
-public interface HostingEnvironmentAppServicePlan extends HasInner<AppServicePlanInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentAppServicePlan extends HasInner<AppServicePlanInner>, HasManager<WebManager> {
     /**
      * @return the adminSiteName value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentDiagnostics.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentDiagnostics.java
index 838dde951199..6c020868de38 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentDiagnostics.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentDiagnostics.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.HostingEnvironmentDiagnosticsInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 
 /**
  * Type representing HostingEnvironmentDiagnostics.
  */
-public interface HostingEnvironmentDiagnostics extends HasInner<HostingEnvironmentDiagnosticsInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentDiagnostics extends HasInner<HostingEnvironmentDiagnosticsInner>, HasManager<WebManager> {
     /**
      * @return the diagnosicsOutput value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentResourceMetric.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentResourceMetric.java
index f97997a4134c..84161822be04 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentResourceMetric.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing HostingEnvironmentResourceMetric.
  */
-public interface HostingEnvironmentResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentResourceMetric extends HasInner<ResourceMetricInner>, HasManager<WebManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentSite.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentSite.java
index 01271f85d8d0..256f08cdc1ed 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentSite.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HostingEnvironmentSite.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.SiteInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -19,7 +19,7 @@
 /**
  * Type representing HostingEnvironmentSite.
  */
-public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<WebManager> {
     /**
      * @return the availabilityState value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnection.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnection.java
index c7aae0ebbc04..1ff9f9f8ecb5 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnection.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnection.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 
 /**
  * Type representing HybridConnection.
  */
-public interface HybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<HybridConnection>, HasManager<AppServiceManager> {
+public interface HybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<HybridConnection>, HasManager<WebManager> {
     /**
      * @return the hostname value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionKey.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionKey.java
index 479b51f7d525..32553b0ea0f3 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionKey.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionKey.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.HybridConnectionKeyInner;
 
 /**
  * Type representing HybridConnectionKey.
  */
-public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<AppServiceManager> {
+public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionLimits.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionLimits.java
index 1c6fc58b4ee1..b7f1dd9c9286 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionLimits.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/HybridConnectionLimits.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.HybridConnectionLimitsInner;
 
 /**
  * Type representing HybridConnectionLimits.
  */
-public interface HybridConnectionLimits extends HasInner<HybridConnectionLimitsInner>, HasManager<AppServiceManager> {
+public interface HybridConnectionLimits extends HasInner<HybridConnectionLimitsInner>, HasManager<WebManager> {
     /**
      * @return the current value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MetricDefinition.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MetricDefinition.java
index 9b4a4f9c7c14..14527a149592 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MetricDefinition.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MetricDefinition.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.MetricDefinitionInner;
 import java.util.List;
 
 /**
  * Type representing MetricDefinition.
  */
-public interface MetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface MetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the displayName value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MultiRolePools.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MultiRolePools.java
index 949a29a6abef..af423269447e 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MultiRolePools.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/MultiRolePools.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WorkerPoolResourceInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing MultiRolePools.
  */
-public interface MultiRolePools extends HasInner<WorkerPoolResourceInner>, HasManager<AppServiceManager> {
+public interface MultiRolePools extends HasInner<WorkerPoolResourceInner>, HasManager<WebManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Operation.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Operation.java
index df34fce5fd09..94238d89e066 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Operation.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Operation.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.OperationInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.List;
 import java.util.UUID;
@@ -19,7 +19,7 @@
 /**
  * Type representing Operation.
  */
-public interface Operation extends HasInner<OperationInner>, HasManager<AppServiceManager> {
+public interface Operation extends HasInner<OperationInner>, HasManager<WebManager> {
     /**
      * @return the createdTime value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ResourceMetricDefinition.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ResourceMetricDefinition.java
index ef05a3c9c83e..5587183559a6 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ResourceMetricDefinition.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ResourceMetricDefinition.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.ResourceMetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Type representing ResourceMetricDefinition.
  */
-public interface ResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface ResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmResourceMetric.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmResourceMetric.java
index 03b0c2641996..632e64b7a502 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmResourceMetric.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing ServerfarmResourceMetric.
  */
-public interface ServerfarmResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface ServerfarmResourceMetric extends HasInner<ResourceMetricInner>, HasManager<WebManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmSite.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmSite.java
index 2d8012b52146..ba7ca8921f3b 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmSite.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/ServerfarmSite.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.SiteInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -19,7 +19,7 @@
 /**
  * Type representing ServerfarmSite.
  */
-public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<AppServiceManager> {
+public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<WebManager> {
     /**
      * @return the availabilityState value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/SkuInfo.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/SkuInfo.java
index 03d09da31099..42d3bdf5c7e4 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/SkuInfo.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/SkuInfo.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.SkuInfoInner;
 
 /**
  * Type representing SkuInfo.
  */
-public interface SkuInfo extends HasInner<SkuInfoInner>, HasManager<AppServiceManager> {
+public interface SkuInfo extends HasInner<SkuInfoInner>, HasManager<WebManager> {
     /**
      * @return the capacity value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/StampCapacity.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/StampCapacity.java
index f4895a139b3c..dfe3487a88bf 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/StampCapacity.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/StampCapacity.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.StampCapacityInner;
 
 /**
  * Type representing StampCapacity.
  */
-public interface StampCapacity extends HasInner<StampCapacityInner>, HasManager<AppServiceManager> {
+public interface StampCapacity extends HasInner<StampCapacityInner>, HasManager<WebManager> {
     /**
      * @return the availableCapacity value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Usage.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Usage.java
index 84e3a66cbd30..feebd222d284 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Usage.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/Usage.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_09_01.implementation.UsageInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing Usage.
  */
-public interface Usage extends HasInner<UsageInner>, HasManager<AppServiceManager> {
+public interface Usage extends HasInner<UsageInner>, HasManager<WebManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetGateway.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetGateway.java
index 2ab55ea42b26..059749513ad9 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetGateway.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetGateway.java
@@ -15,12 +15,12 @@
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 
 /**
  * Type representing VnetGateway.
  */
-public interface VnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<VnetGateway>, Updatable<VnetGateway.Update>, HasManager<AppServiceManager> {
+public interface VnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<VnetGateway>, Updatable<VnetGateway.Update>, HasManager<WebManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetInfo.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetInfo.java
index 8b77af99590a..87d9d6106f5f 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetInfo.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetInfo.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing VnetInfo.
  */
-public interface VnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<VnetInfo>, HasManager<AppServiceManager> {
+public interface VnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<VnetInfo>, HasManager<WebManager> {
     /**
      * @return the certBlob value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetRoute.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetRoute.java
index 507ff43376a5..4200004aece2 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetRoute.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/VnetRoute.java
@@ -15,12 +15,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 
 /**
  * Type representing VnetRoute.
  */
-public interface VnetRoute extends HasInner<VnetRouteInner>, Indexable, Updatable<VnetRoute.Update>, HasManager<AppServiceManager> {
+public interface VnetRoute extends HasInner<VnetRouteInner>, Indexable, Updatable<VnetRoute.Update>, HasManager<WebManager> {
     /**
      * @return the endAddress value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/WorkerPools.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/WorkerPools.java
index 94c2364b7986..143df3cd044d 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/WorkerPools.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/WorkerPools.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_09_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing WorkerPools.
  */
-public interface WorkerPools extends HasInner<WorkerPoolResourceInner>, Indexable, Refreshable<WorkerPools>, Updatable<WorkerPools.Update>, HasManager<AppServiceManager> {
+public interface WorkerPools extends HasInner<WorkerPoolResourceInner>, Indexable, Refreshable<WorkerPools>, Updatable<WorkerPools.Update>, HasManager<WebManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AddressResponseImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AddressResponseImpl.java
index 1fcdbd1f29ab..c939729c2118 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AddressResponseImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AddressResponseImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.VirtualIPMapping;
 
 class AddressResponseImpl extends WrapperImpl<AddressResponseInner> implements AddressResponse {
-    private final AppServiceManager manager;
-    AddressResponseImpl(AddressResponseInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    AddressResponseImpl(AddressResponseInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentResourceImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentResourceImpl.java
index 3d6612bfb314..7ce339da9142 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentResourceImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentResourceImpl.java
@@ -25,9 +25,9 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.StampCapacity;
 import rx.functions.Func1;
 
-class AppServiceEnvironmentResourceImpl extends GroupableResourceCoreImpl<AppServiceEnvironmentResource, AppServiceEnvironmentResourceInner, AppServiceEnvironmentResourceImpl, AppServiceManager> implements AppServiceEnvironmentResource, AppServiceEnvironmentResource.Definition, AppServiceEnvironmentResource.Update {
+class AppServiceEnvironmentResourceImpl extends GroupableResourceCoreImpl<AppServiceEnvironmentResource, AppServiceEnvironmentResourceInner, AppServiceEnvironmentResourceImpl, WebManager> implements AppServiceEnvironmentResource, AppServiceEnvironmentResource.Definition, AppServiceEnvironmentResource.Update {
     private AppServiceEnvironmentPatchResource updateParameter;
-    AppServiceEnvironmentResourceImpl(String name, AppServiceEnvironmentResourceInner inner, AppServiceManager manager) {
+    AppServiceEnvironmentResourceImpl(String name, AppServiceEnvironmentResourceInner inner, WebManager manager) {
         super(name, inner, manager);
         this.updateParameter = new AppServiceEnvironmentPatchResource();
     }
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentsImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentsImpl.java
index d11b8a2eba24..3b3bc650474f 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentsImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServiceEnvironmentsImpl.java
@@ -33,14 +33,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.WorkerPools;
 
 class AppServiceEnvironmentsImpl extends WrapperImpl<AppServiceEnvironmentsInner> implements AppServiceEnvironments {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    AppServiceEnvironmentsImpl(AppServiceManager manager) {
+    AppServiceEnvironmentsImpl(WebManager manager) {
         super(manager.inner().appServiceEnvironments());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlanImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlanImpl.java
index e35a555c759f..5940fceb9a29 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlanImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlanImpl.java
@@ -19,9 +19,9 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.SkuDescription;
 import rx.functions.Func1;
 
-class AppServicePlanImpl extends GroupableResourceCoreImpl<AppServicePlan, AppServicePlanInner, AppServicePlanImpl, AppServiceManager> implements AppServicePlan, AppServicePlan.Definition, AppServicePlan.Update {
+class AppServicePlanImpl extends GroupableResourceCoreImpl<AppServicePlan, AppServicePlanInner, AppServicePlanImpl, WebManager> implements AppServicePlan, AppServicePlan.Definition, AppServicePlan.Update {
     private AppServicePlanPatchResource updateParameter;
-    AppServicePlanImpl(String name, AppServicePlanInner inner, AppServiceManager manager) {
+    AppServicePlanImpl(String name, AppServicePlanInner inner, WebManager manager) {
         super(name, inner, manager);
         this.updateParameter = new AppServicePlanPatchResource();
     }
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlansImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlansImpl.java
index e4cf06f2d0e2..522de611ede9 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlansImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/AppServicePlansImpl.java
@@ -30,14 +30,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.VnetRoute;
 
 class AppServicePlansImpl extends WrapperImpl<AppServicePlansInner> implements AppServicePlans {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    AppServicePlansImpl(AppServiceManager manager) {
+    AppServicePlansImpl(WebManager manager) {
         super(manager.inner().appServicePlans());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CapabilityImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CapabilityImpl.java
index ef1bb45579ab..b24563492241 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CapabilityImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CapabilityImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class CapabilityImpl extends WrapperImpl<CapabilityInner> implements Capability {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    CapabilityImpl(CapabilityInner inner,  AppServiceManager manager) {
+    CapabilityImpl(CapabilityInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CsmUsageQuotaImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CsmUsageQuotaImpl.java
index fd4b2a5de490..c9db72460822 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CsmUsageQuotaImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/CsmUsageQuotaImpl.java
@@ -15,15 +15,15 @@
 import org.joda.time.DateTime;
 
 class CsmUsageQuotaImpl extends WrapperImpl<CsmUsageQuotaInner> implements CsmUsageQuota {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    CsmUsageQuotaImpl(CsmUsageQuotaInner inner,  AppServiceManager manager) {
+    CsmUsageQuotaImpl(CsmUsageQuotaInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentAppServicePlanImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentAppServicePlanImpl.java
index 369afd29d9df..5d56b7ea9a49 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentAppServicePlanImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentAppServicePlanImpl.java
@@ -19,15 +19,15 @@
 import java.util.Map;
 
 class HostingEnvironmentAppServicePlanImpl extends WrapperImpl<AppServicePlanInner> implements HostingEnvironmentAppServicePlan {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    HostingEnvironmentAppServicePlanImpl(AppServicePlanInner inner,  AppServiceManager manager) {
+    HostingEnvironmentAppServicePlanImpl(AppServicePlanInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentDiagnosticsImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentDiagnosticsImpl.java
index 4e76760c665d..d9ad3354980a 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentDiagnosticsImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentDiagnosticsImpl.java
@@ -13,18 +13,18 @@
 import rx.Observable;
 
 class HostingEnvironmentDiagnosticsImpl extends WrapperImpl<HostingEnvironmentDiagnosticsInner> implements HostingEnvironmentDiagnostics {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String diagnosticsName;
 
-    HostingEnvironmentDiagnosticsImpl(HostingEnvironmentDiagnosticsInner inner,  AppServiceManager manager) {
+    HostingEnvironmentDiagnosticsImpl(HostingEnvironmentDiagnosticsInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentResourceMetricImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentResourceMetricImpl.java
index 41f28f5b4157..f431d61215ea 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentResourceMetricImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.ResourceMetricProperty;
 
 class HostingEnvironmentResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements HostingEnvironmentResourceMetric {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    HostingEnvironmentResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    HostingEnvironmentResourceMetricImpl(ResourceMetricInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentSiteImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentSiteImpl.java
index 996d3351ca49..cda191627388 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentSiteImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HostingEnvironmentSiteImpl.java
@@ -25,15 +25,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.UsageState;
 
 class HostingEnvironmentSiteImpl extends WrapperImpl<SiteInner> implements HostingEnvironmentSite {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    HostingEnvironmentSiteImpl(SiteInner inner,  AppServiceManager manager) {
+    HostingEnvironmentSiteImpl(SiteInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionImpl.java
index 5c5653f275ed..5e4e934f52f8 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class HybridConnectionImpl extends IndexableRefreshableWrapperImpl<HybridConnection, HybridConnectionInner> implements HybridConnection {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String namespaceName;
     private String relayName;
 
-    HybridConnectionImpl(HybridConnectionInner inner,  AppServiceManager manager) {
+    HybridConnectionImpl(HybridConnectionInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -29,7 +29,7 @@ class HybridConnectionImpl extends IndexableRefreshableWrapperImpl<HybridConnect
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionKeyImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionKeyImpl.java
index 56207140e930..757758269f5e 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionKeyImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionKeyImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class HybridConnectionKeyImpl extends WrapperImpl<HybridConnectionKeyInner> implements HybridConnectionKey {
-    private final AppServiceManager manager;
-    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionLimitsImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionLimitsImpl.java
index 4c830257c9a4..a02839a566c6 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionLimitsImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/HybridConnectionLimitsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class HybridConnectionLimitsImpl extends WrapperImpl<HybridConnectionLimitsInner> implements HybridConnectionLimits {
-    private final AppServiceManager manager;
-    HybridConnectionLimitsImpl(HybridConnectionLimitsInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    HybridConnectionLimitsImpl(HybridConnectionLimitsInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MetricDefinitionImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MetricDefinitionImpl.java
index ac7ea7a99a5e..4b7a19f222d2 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MetricDefinitionImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.MetricAvailabilily;
 
 class MetricDefinitionImpl extends WrapperImpl<MetricDefinitionInner> implements MetricDefinition {
-    private final AppServiceManager manager;
-    MetricDefinitionImpl(MetricDefinitionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    MetricDefinitionImpl(MetricDefinitionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MultiRolePoolsImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MultiRolePoolsImpl.java
index d2bec7cb4435..21dcdd970e56 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MultiRolePoolsImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/MultiRolePoolsImpl.java
@@ -16,15 +16,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.SkuDescription;
 
 class MultiRolePoolsImpl extends WrapperImpl<WorkerPoolResourceInner> implements MultiRolePools {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    MultiRolePoolsImpl(WorkerPoolResourceInner inner,  AppServiceManager manager) {
+    MultiRolePoolsImpl(WorkerPoolResourceInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/OperationImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/OperationImpl.java
index 462a90e20938..df05b45e3944 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/OperationImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/OperationImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.OperationStatus;
 
 class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    OperationImpl(OperationInner inner,  AppServiceManager manager) {
+    OperationImpl(OperationInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ResourceMetricDefinitionImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ResourceMetricDefinitionImpl.java
index 1643835c5ab7..d7749d476191 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ResourceMetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ResourceMetricDefinitionImpl.java
@@ -17,15 +17,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.ResourceMetricName;
 
 class ResourceMetricDefinitionImpl extends WrapperImpl<ResourceMetricDefinitionInner> implements ResourceMetricDefinition {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  AppServiceManager manager) {
+    ResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmResourceMetricImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmResourceMetricImpl.java
index 38a8aa4fe55c..924c3ee6e2c2 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmResourceMetricImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.ResourceMetricProperty;
 
 class ServerfarmResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements ServerfarmResourceMetric {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ServerfarmResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    ServerfarmResourceMetricImpl(ResourceMetricInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmSiteImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmSiteImpl.java
index 5a11e921cb9d..90ccfeab0739 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmSiteImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/ServerfarmSiteImpl.java
@@ -25,15 +25,15 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.UsageState;
 
 class ServerfarmSiteImpl extends WrapperImpl<SiteInner> implements ServerfarmSite {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ServerfarmSiteImpl(SiteInner inner,  AppServiceManager manager) {
+    ServerfarmSiteImpl(SiteInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/SkuInfoImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/SkuInfoImpl.java
index 1d9a13c5993d..79649b0a1a34 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/SkuInfoImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/SkuInfoImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.SkuDescription;
 
 class SkuInfoImpl extends WrapperImpl<SkuInfoInner> implements SkuInfo {
-    private final AppServiceManager manager;
-    SkuInfoImpl(SkuInfoInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    SkuInfoImpl(SkuInfoInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/StampCapacityImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/StampCapacityImpl.java
index 14492a1a6854..f6eef41d0454 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/StampCapacityImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/StampCapacityImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.WorkerSizeOptions;
 
 class StampCapacityImpl extends WrapperImpl<StampCapacityInner> implements StampCapacity {
-    private final AppServiceManager manager;
-    StampCapacityImpl(StampCapacityInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    StampCapacityImpl(StampCapacityInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/UsageImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/UsageImpl.java
index e49610b91733..0407cdaec09b 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/UsageImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/UsageImpl.java
@@ -14,14 +14,14 @@
 import org.joda.time.DateTime;
 
 class UsageImpl extends WrapperImpl<UsageInner> implements Usage {
-    private final AppServiceManager manager;
-    UsageImpl(UsageInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    UsageImpl(UsageInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetGatewayImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetGatewayImpl.java
index d4282b739f37..b7ec25d836b0 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetGatewayImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetGatewayImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInner, VnetGatewayImpl> implements VnetGateway, VnetGateway.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String gatewayName;
 
-    VnetGatewayImpl(String name, AppServiceManager manager) {
+    VnetGatewayImpl(String name, WebManager manager) {
         super(name, new VnetGatewayInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInn
         //
     }
 
-    VnetGatewayImpl(VnetGatewayInner inner, AppServiceManager manager) {
+    VnetGatewayImpl(VnetGatewayInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -41,7 +41,7 @@ class VnetGatewayImpl extends CreatableUpdatableImpl<VnetGateway, VnetGatewayInn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetInfoImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetInfoImpl.java
index 8c51dd2ad907..a06d8120e6e3 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetInfoImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetInfoImpl.java
@@ -16,12 +16,12 @@
 import java.util.List;
 
 class VnetInfoImpl extends IndexableRefreshableWrapperImpl<VnetInfo, VnetInfoInner> implements VnetInfo {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
 
-    VnetInfoImpl(VnetInfoInner inner,  AppServiceManager manager) {
+    VnetInfoImpl(VnetInfoInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -30,7 +30,7 @@ class VnetInfoImpl extends IndexableRefreshableWrapperImpl<VnetInfo, VnetInfoInn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetRouteImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetRouteImpl.java
index b12e0dfccea0..686958cbb364 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetRouteImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/VnetRouteImpl.java
@@ -14,13 +14,13 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.RouteType;
 
 class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, VnetRouteImpl> implements VnetRoute, VnetRoute.Definition, VnetRoute.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String routeName;
 
-    VnetRouteImpl(String name, AppServiceManager manager) {
+    VnetRouteImpl(String name, WebManager manager) {
         super(name, new VnetRouteInner());
         this.manager = manager;
         // Set resource name
@@ -28,7 +28,7 @@ class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, Vn
         //
     }
 
-    VnetRouteImpl(VnetRouteInner inner, AppServiceManager manager) {
+    VnetRouteImpl(VnetRouteInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, Vn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WebManager.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WebManager.java
new file mode 100644
index 000000000000..a181396e7016
--- /dev/null
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WebManager.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2016_09_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.appservice.v2016_09_01.AppServiceEnvironments;
+import com.microsoft.azure.management.appservice.v2016_09_01.AppServicePlans;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Web resource management.
+ */
+public final class WebManager extends ManagerCore<WebManager, WebSiteManagementClientImpl> {
+    private AppServiceEnvironments appServiceEnvironments;
+    private AppServicePlans appServicePlans;
+    /**
+    * Get a Configurable instance that can be used to create WebManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new WebManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new WebManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(RestClient restClient, String subscriptionId) {
+        return new WebManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of WebManager that exposes Web management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Web management API entry points that work across subscriptions
+        */
+        WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage AppServiceEnvironments.
+     */
+    public AppServiceEnvironments appServiceEnvironments() {
+        if (this.appServiceEnvironments == null) {
+            this.appServiceEnvironments = new AppServiceEnvironmentsImpl(this);
+        }
+        return this.appServiceEnvironments;
+    }
+
+    /**
+     * @return Entry point to manage AppServicePlans.
+     */
+    public AppServicePlans appServicePlans() {
+        if (this.appServicePlans == null) {
+            this.appServicePlans = new AppServicePlansImpl(this);
+        }
+        return this.appServicePlans;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return WebManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private WebManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new WebSiteManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WorkerPoolsImpl.java b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WorkerPoolsImpl.java
index abf4e6b33991..83bdfd2081e0 100644
--- a/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WorkerPoolsImpl.java
+++ b/appservice/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/appservice/v2016_09_01/implementation/WorkerPoolsImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2016_09_01.SkuDescription;
 
 class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolResourceInner, WorkerPoolsImpl> implements WorkerPools, WorkerPools.Definition, WorkerPools.Update {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String workerPoolName;
 
-    WorkerPoolsImpl(String name, AppServiceManager manager) {
+    WorkerPoolsImpl(String name, WebManager manager) {
         super(name, new WorkerPoolResourceInner());
         this.manager = manager;
         // Set resource name
@@ -29,7 +29,7 @@ class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolReso
         //
     }
 
-    WorkerPoolsImpl(WorkerPoolResourceInner inner, AppServiceManager manager) {
+    WorkerPoolsImpl(WorkerPoolResourceInner inner, WebManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolReso
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/pom.xml b/appservice/resource-manager/v2018_02_01/pom.xml
index ee0d32b6ea45..396b9197212e 100644
--- a/appservice/resource-manager/v2018_02_01/pom.xml
+++ b/appservice/resource-manager/v2018_02_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.appservice.v2018_02_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-appservice</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for CertificateRegistration Management</name>
-    <description>This package contains Microsoft CertificateRegistration Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.appservice.v2018_02_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-certificateregistration</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for CertificateRegistration Management</name>
+    <description>This package contains Microsoft CertificateRegistration Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AddressResponse.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AddressResponse.java
index 485fc5340628..3efba1b64ced 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AddressResponse.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AddressResponse.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AddressResponseInner;
 import java.util.List;
 
 /**
  * Type representing AddressResponse.
  */
-public interface AddressResponse extends HasInner<AddressResponseInner>, HasManager<AppServiceManager> {
+public interface AddressResponse extends HasInner<AddressResponseInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the internalIpAddress value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AnalysisDefinition.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AnalysisDefinition.java
index 5dca9b069cae..13c1bc9081cb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AnalysisDefinition.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AnalysisDefinition.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AnalysisDefinitionInner;
 
 /**
  * Type representing AnalysisDefinition.
  */
-public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<AppServiceManager> {
+public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateOrder.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateOrder.java
index 9fc35038dbde..f79ef4774fe1 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateOrder.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateOrder.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 import org.joda.time.DateTime;
 import java.util.List;
@@ -26,7 +26,7 @@
 /**
  * Type representing AppServiceCertificateOrder.
  */
-public interface AppServiceCertificateOrder extends HasInner<AppServiceCertificateOrderInner>, Resource, GroupableResourceCore<AppServiceManager, AppServiceCertificateOrderInner>, HasResourceGroup, Refreshable<AppServiceCertificateOrder>, Updatable<AppServiceCertificateOrder.Update>, HasManager<AppServiceManager> {
+public interface AppServiceCertificateOrder extends HasInner<AppServiceCertificateOrderInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, AppServiceCertificateOrderInner>, HasResourceGroup, Refreshable<AppServiceCertificateOrder>, Updatable<AppServiceCertificateOrder.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the appServiceCertificateNotRenewableReasons value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateResource.java
index 87645d507072..44cada2181ff 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceCertificateResource.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing AppServiceCertificateResource.
  */
-public interface AppServiceCertificateResource extends HasInner<AppServiceCertificateResourceInner>, Indexable, Refreshable<AppServiceCertificateResource>, Updatable<AppServiceCertificateResource.Update>, HasManager<AppServiceManager> {
+public interface AppServiceCertificateResource extends HasInner<AppServiceCertificateResourceInner>, Indexable, Refreshable<AppServiceCertificateResource>, Updatable<AppServiceCertificateResource.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentPatchResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentPatchResource.java
index 85e4aa56be02..dbe081648030 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentPatchResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentPatchResource.java
@@ -259,6 +259,19 @@ public class AppServiceEnvironmentPatchResource extends ProxyOnlyResource {
     @JsonProperty(value = "properties.hasLinuxWorkers")
     private Boolean hasLinuxWorkers;
 
+    /**
+     * Key Vault ID for ILB App Service Environment default SSL certificate.
+     */
+    @JsonProperty(value = "properties.sslCertKeyVaultId")
+    private String sslCertKeyVaultId;
+
+    /**
+     * Key Vault Secret Name for ILB App Service Environment default SSL
+     * certificate.
+     */
+    @JsonProperty(value = "properties.sslCertKeyVaultSecretName")
+    private String sslCertKeyVaultSecretName;
+
     /**
      * Get name of the App Service Environment.
      *
@@ -816,4 +829,44 @@ public AppServiceEnvironmentPatchResource withHasLinuxWorkers(Boolean hasLinuxWo
         return this;
     }
 
+    /**
+     * Get key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultId value
+     */
+    public String sslCertKeyVaultId() {
+        return this.sslCertKeyVaultId;
+    }
+
+    /**
+     * Set key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultId the sslCertKeyVaultId value to set
+     * @return the AppServiceEnvironmentPatchResource object itself.
+     */
+    public AppServiceEnvironmentPatchResource withSslCertKeyVaultId(String sslCertKeyVaultId) {
+        this.sslCertKeyVaultId = sslCertKeyVaultId;
+        return this;
+    }
+
+    /**
+     * Get key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultSecretName value
+     */
+    public String sslCertKeyVaultSecretName() {
+        return this.sslCertKeyVaultSecretName;
+    }
+
+    /**
+     * Set key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultSecretName the sslCertKeyVaultSecretName value to set
+     * @return the AppServiceEnvironmentPatchResource object itself.
+     */
+    public AppServiceEnvironmentPatchResource withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName) {
+        this.sslCertKeyVaultSecretName = sslCertKeyVaultSecretName;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentResource.java
index 0e419786197c..d3ef83016dbe 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironmentResource.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.StampCapacityInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceEnvironmentResourceInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing AppServiceEnvironmentResource.
  */
-public interface AppServiceEnvironmentResource extends HasInner<AppServiceEnvironmentResourceInner>, Resource, GroupableResourceCore<AppServiceManager, AppServiceEnvironmentResourceInner>, HasResourceGroup, Refreshable<AppServiceEnvironmentResource>, Updatable<AppServiceEnvironmentResource.Update>, HasManager<AppServiceManager> {
+public interface AppServiceEnvironmentResource extends HasInner<AppServiceEnvironmentResourceInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, AppServiceEnvironmentResourceInner>, HasResourceGroup, Refreshable<AppServiceEnvironmentResource>, Updatable<AppServiceEnvironmentResource.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the allowedMultiSizes value.
      */
@@ -161,6 +161,16 @@ public interface AppServiceEnvironmentResource extends HasInner<AppServiceEnviro
      */
     String resourceGroup();
 
+    /**
+     * @return the sslCertKeyVaultId value.
+     */
+    String sslCertKeyVaultId();
+
+    /**
+     * @return the sslCertKeyVaultSecretName value.
+     */
+    String sslCertKeyVaultSecretName();
+
     /**
      * @return the status value.
      */
@@ -398,6 +408,26 @@ interface WithNetworkAccessControlList {
             WithCreate withNetworkAccessControlList(List<NetworkAccessControlEntry> networkAccessControlList);
         }
 
+        /**
+         * The stage of the appserviceenvironmentresource update allowing to specify SslCertKeyVaultId.
+         */
+        interface WithSslCertKeyVaultId {
+            /**
+             * Specifies sslCertKeyVaultId.
+             */
+            WithCreate withSslCertKeyVaultId(String sslCertKeyVaultId);
+        }
+
+        /**
+         * The stage of the appserviceenvironmentresource update allowing to specify SslCertKeyVaultSecretName.
+         */
+        interface WithSslCertKeyVaultSecretName {
+            /**
+             * Specifies sslCertKeyVaultSecretName.
+             */
+            WithCreate withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName);
+        }
+
         /**
          * The stage of the appserviceenvironmentresource update allowing to specify Suspended.
          */
@@ -453,13 +483,13 @@ interface WithVnetSubnetName {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<AppServiceEnvironmentResource>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithApiManagementAccountId, DefinitionStages.WithClusterSettings, DefinitionStages.WithDnsSuffix, DefinitionStages.WithDynamicCacheEnabled, DefinitionStages.WithFrontEndScaleFactor, DefinitionStages.WithHasLinuxWorkers, DefinitionStages.WithInternalLoadBalancingMode, DefinitionStages.WithIpsslAddressCount, DefinitionStages.WithKind, DefinitionStages.WithMultiRoleCount, DefinitionStages.WithMultiSize, DefinitionStages.WithNetworkAccessControlList, DefinitionStages.WithSuspended, DefinitionStages.WithUserWhitelistedIpRanges, DefinitionStages.WithVnetName, DefinitionStages.WithVnetResourceGroupName, DefinitionStages.WithVnetSubnetName {
+        interface WithCreate extends Creatable<AppServiceEnvironmentResource>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithApiManagementAccountId, DefinitionStages.WithClusterSettings, DefinitionStages.WithDnsSuffix, DefinitionStages.WithDynamicCacheEnabled, DefinitionStages.WithFrontEndScaleFactor, DefinitionStages.WithHasLinuxWorkers, DefinitionStages.WithInternalLoadBalancingMode, DefinitionStages.WithIpsslAddressCount, DefinitionStages.WithKind, DefinitionStages.WithMultiRoleCount, DefinitionStages.WithMultiSize, DefinitionStages.WithNetworkAccessControlList, DefinitionStages.WithSslCertKeyVaultId, DefinitionStages.WithSslCertKeyVaultSecretName, DefinitionStages.WithSuspended, DefinitionStages.WithUserWhitelistedIpRanges, DefinitionStages.WithVnetName, DefinitionStages.WithVnetResourceGroupName, DefinitionStages.WithVnetSubnetName {
         }
     }
     /**
      * The template for a AppServiceEnvironmentResource update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<AppServiceEnvironmentResource>, Resource.UpdateWithTags<Update>, UpdateStages.WithApiManagementAccountId, UpdateStages.WithClusterSettings, UpdateStages.WithDnsSuffix, UpdateStages.WithDynamicCacheEnabled, UpdateStages.WithFrontEndScaleFactor, UpdateStages.WithHasLinuxWorkers, UpdateStages.WithInternalLoadBalancingMode, UpdateStages.WithIpsslAddressCount, UpdateStages.WithKind, UpdateStages.WithMultiRoleCount, UpdateStages.WithMultiSize, UpdateStages.WithNetworkAccessControlList, UpdateStages.WithSuspended, UpdateStages.WithUserWhitelistedIpRanges, UpdateStages.WithVnetName, UpdateStages.WithVnetResourceGroupName, UpdateStages.WithVnetSubnetName {
+    interface Update extends Appliable<AppServiceEnvironmentResource>, Resource.UpdateWithTags<Update>, UpdateStages.WithApiManagementAccountId, UpdateStages.WithClusterSettings, UpdateStages.WithDnsSuffix, UpdateStages.WithDynamicCacheEnabled, UpdateStages.WithFrontEndScaleFactor, UpdateStages.WithHasLinuxWorkers, UpdateStages.WithInternalLoadBalancingMode, UpdateStages.WithIpsslAddressCount, UpdateStages.WithKind, UpdateStages.WithMultiRoleCount, UpdateStages.WithMultiSize, UpdateStages.WithNetworkAccessControlList, UpdateStages.WithSslCertKeyVaultId, UpdateStages.WithSslCertKeyVaultSecretName, UpdateStages.WithSuspended, UpdateStages.WithUserWhitelistedIpRanges, UpdateStages.WithVnetName, UpdateStages.WithVnetResourceGroupName, UpdateStages.WithVnetSubnetName {
     }
 
     /**
@@ -586,6 +616,26 @@ interface WithNetworkAccessControlList {
             Update withNetworkAccessControlList(List<NetworkAccessControlEntry> networkAccessControlList);
         }
 
+        /**
+         * The stage of the appserviceenvironmentresource {0} allowing to specify SslCertKeyVaultId.
+         */
+        interface WithSslCertKeyVaultId {
+            /**
+             * Specifies sslCertKeyVaultId.
+             */
+            Update withSslCertKeyVaultId(String sslCertKeyVaultId);
+        }
+
+        /**
+         * The stage of the appserviceenvironmentresource {0} allowing to specify SslCertKeyVaultSecretName.
+         */
+        interface WithSslCertKeyVaultSecretName {
+            /**
+             * Specifies sslCertKeyVaultSecretName.
+             */
+            Update withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName);
+        }
+
         /**
          * The stage of the appserviceenvironmentresource {0} allowing to specify Suspended.
          */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironments.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironments.java
index 6ae9355a3a02..9f127c86dbdf 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironments.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServiceEnvironments.java
@@ -124,17 +124,6 @@ public interface AppServiceEnvironments {
      */
     Observable<Sites> suspendAsync(final String resourceGroupName, final String name);
 
-    /**
-     * Resume an App Service Environment.
-     * Resume an App Service Environment.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the App Service Environment.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Completable syncVirtualNetworkInfoAsync(String resourceGroupName, String name);
-
     /**
      * Get the used, available, and total worker capacity an App Service Environment.
      * Get the used, available, and total worker capacity an App Service Environment.
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlan.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlan.java
index 26fe53862a56..6f6cc290ad8d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlan.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlan.java
@@ -17,19 +17,24 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServicePlanInner;
 
 /**
  * Type representing AppServicePlan.
  */
-public interface AppServicePlan extends HasInner<AppServicePlanInner>, Resource, GroupableResourceCore<AppServiceManager, AppServicePlanInner>, HasResourceGroup, Refreshable<AppServicePlan>, Updatable<AppServicePlan.Update>, HasManager<AppServiceManager> {
+public interface AppServicePlan extends HasInner<AppServicePlanInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, AppServicePlanInner>, HasResourceGroup, Refreshable<AppServicePlan>, Updatable<AppServicePlan.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the adminSiteName value.
      */
     String adminSiteName();
 
+    /**
+     * @return the freeOfferExpirationTime value.
+     */
+    DateTime freeOfferExpirationTime();
+
     /**
      * @return the geoRegion value.
      */
@@ -40,6 +45,11 @@ public interface AppServicePlan extends HasInner<AppServicePlanInner>, Resource,
      */
     HostingEnvironmentProfile hostingEnvironmentProfile();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the isSpot value.
      */
@@ -152,6 +162,16 @@ interface WithAdminSiteName {
             WithCreate withAdminSiteName(String adminSiteName);
         }
 
+        /**
+         * The stage of the appserviceplan update allowing to specify FreeOfferExpirationTime.
+         */
+        interface WithFreeOfferExpirationTime {
+            /**
+             * Specifies freeOfferExpirationTime.
+             */
+            WithCreate withFreeOfferExpirationTime(DateTime freeOfferExpirationTime);
+        }
+
         /**
          * The stage of the appserviceplan update allowing to specify HostingEnvironmentProfile.
          */
@@ -162,6 +182,16 @@ interface WithHostingEnvironmentProfile {
             WithCreate withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile);
         }
 
+        /**
+         * The stage of the appserviceplan update allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            WithCreate withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the appserviceplan update allowing to specify IsSpot.
          */
@@ -267,13 +297,13 @@ interface WithWorkerTierName {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<AppServicePlan>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdminSiteName, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithIsSpot, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithPerSiteScaling, DefinitionStages.WithReserved, DefinitionStages.WithSku, DefinitionStages.WithSpotExpirationTime, DefinitionStages.WithTargetWorkerCount, DefinitionStages.WithTargetWorkerSizeId, DefinitionStages.WithWorkerTierName {
+        interface WithCreate extends Creatable<AppServicePlan>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdminSiteName, DefinitionStages.WithFreeOfferExpirationTime, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithHyperV, DefinitionStages.WithIsSpot, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithPerSiteScaling, DefinitionStages.WithReserved, DefinitionStages.WithSku, DefinitionStages.WithSpotExpirationTime, DefinitionStages.WithTargetWorkerCount, DefinitionStages.WithTargetWorkerSizeId, DefinitionStages.WithWorkerTierName {
         }
     }
     /**
      * The template for a AppServicePlan update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<AppServicePlan>, Resource.UpdateWithTags<Update>, UpdateStages.WithAdminSiteName, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithIsSpot, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithPerSiteScaling, UpdateStages.WithReserved, UpdateStages.WithSpotExpirationTime, UpdateStages.WithTargetWorkerCount, UpdateStages.WithTargetWorkerSizeId, UpdateStages.WithWorkerTierName {
+    interface Update extends Appliable<AppServicePlan>, Resource.UpdateWithTags<Update>, UpdateStages.WithAdminSiteName, UpdateStages.WithFreeOfferExpirationTime, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithHyperV, UpdateStages.WithIsSpot, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithPerSiteScaling, UpdateStages.WithReserved, UpdateStages.WithSpotExpirationTime, UpdateStages.WithTargetWorkerCount, UpdateStages.WithTargetWorkerSizeId, UpdateStages.WithWorkerTierName {
     }
 
     /**
@@ -290,6 +320,16 @@ interface WithAdminSiteName {
             Update withAdminSiteName(String adminSiteName);
         }
 
+        /**
+         * The stage of the appserviceplan {0} allowing to specify FreeOfferExpirationTime.
+         */
+        interface WithFreeOfferExpirationTime {
+            /**
+             * Specifies freeOfferExpirationTime.
+             */
+            Update withFreeOfferExpirationTime(DateTime freeOfferExpirationTime);
+        }
+
         /**
          * The stage of the appserviceplan {0} allowing to specify HostingEnvironmentProfile.
          */
@@ -300,6 +340,16 @@ interface WithHostingEnvironmentProfile {
             Update withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile);
         }
 
+        /**
+         * The stage of the appserviceplan {0} allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            Update withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the appserviceplan {0} allowing to specify IsSpot.
          */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlanPatchResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlanPatchResource.java
index f9430a4534d1..7602c9cd1459 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlanPatchResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AppServicePlanPatchResource.java
@@ -91,6 +91,12 @@ public class AppServicePlanPatchResource extends ProxyOnlyResource {
     @JsonProperty(value = "properties.spotExpirationTime")
     private DateTime spotExpirationTime;
 
+    /**
+     * The time when the server farm free offer expires.
+     */
+    @JsonProperty(value = "properties.freeOfferExpirationTime")
+    private DateTime freeOfferExpirationTime;
+
     /**
      * Resource group of the App Service plan.
      */
@@ -105,12 +111,19 @@ public class AppServicePlanPatchResource extends ProxyOnlyResource {
     private Boolean reserved;
 
     /**
-     * If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;,
-     * &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Obsolete: If Hyper-V container app service plan
+     * &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      */
     @JsonProperty(value = "properties.isXenon")
     private Boolean isXenon;
 
+    /**
+     * If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;,
+     * &lt;code&gt;false&lt;/code&gt; otherwise.
+     */
+    @JsonProperty(value = "properties.hyperV")
+    private Boolean hyperV;
+
     /**
      * Scaling worker count.
      */
@@ -297,6 +310,26 @@ public AppServicePlanPatchResource withSpotExpirationTime(DateTime spotExpiratio
         return this;
     }
 
+    /**
+     * Get the time when the server farm free offer expires.
+     *
+     * @return the freeOfferExpirationTime value
+     */
+    public DateTime freeOfferExpirationTime() {
+        return this.freeOfferExpirationTime;
+    }
+
+    /**
+     * Set the time when the server farm free offer expires.
+     *
+     * @param freeOfferExpirationTime the freeOfferExpirationTime value to set
+     * @return the AppServicePlanPatchResource object itself.
+     */
+    public AppServicePlanPatchResource withFreeOfferExpirationTime(DateTime freeOfferExpirationTime) {
+        this.freeOfferExpirationTime = freeOfferExpirationTime;
+        return this;
+    }
+
     /**
      * Get resource group of the App Service plan.
      *
@@ -327,7 +360,7 @@ public AppServicePlanPatchResource withReserved(Boolean reserved) {
     }
 
     /**
-     * Get if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Get obsolete: If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      *
      * @return the isXenon value
      */
@@ -336,7 +369,7 @@ public Boolean isXenon() {
     }
 
     /**
-     * Set if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Set obsolete: If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      *
      * @param isXenon the isXenon value to set
      * @return the AppServicePlanPatchResource object itself.
@@ -346,6 +379,26 @@ public AppServicePlanPatchResource withIsXenon(Boolean isXenon) {
         return this;
     }
 
+    /**
+     * Get if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     *
+     * @return the hyperV value
+     */
+    public Boolean hyperV() {
+        return this.hyperV;
+    }
+
+    /**
+     * Set if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     *
+     * @param hyperV the hyperV value to set
+     * @return the AppServicePlanPatchResource object itself.
+     */
+    public AppServicePlanPatchResource withHyperV(Boolean hyperV) {
+        this.hyperV = hyperV;
+        return this;
+    }
+
     /**
      * Get scaling worker count.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ApplicationStack.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ApplicationStack.java
index 18b4e53491e2..cc133eae793c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ApplicationStack.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ApplicationStack.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ApplicationStackInner;
 import java.util.List;
 
 /**
  * Type representing ApplicationStack.
  */
-public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<AppServiceManager> {
+public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the dependency value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageInfoValue.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageInfoValue.java
new file mode 100644
index 000000000000..4cf1e5f2abf7
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageInfoValue.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Azure Files or Blob Storage access information value for dictionary storage.
+ */
+public class AzureStorageInfoValue {
+    /**
+     * Type of storage. Possible values include: 'AzureFiles', 'AzureBlob'.
+     */
+    @JsonProperty(value = "type")
+    private AzureStorageType type;
+
+    /**
+     * Name of the storage account.
+     */
+    @JsonProperty(value = "accountName")
+    private String accountName;
+
+    /**
+     * Name of the file share (container name, for Blob storage).
+     */
+    @JsonProperty(value = "shareName")
+    private String shareName;
+
+    /**
+     * Access key for the storage account.
+     */
+    @JsonProperty(value = "accessKey")
+    private String accessKey;
+
+    /**
+     * Path to mount the storage within the site's runtime environment.
+     */
+    @JsonProperty(value = "mountPath")
+    private String mountPath;
+
+    /**
+     * State of the storage account. Possible values include: 'Ok',
+     * 'InvalidCredentials', 'InvalidShare'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private AzureStorageState state;
+
+    /**
+     * Get type of storage. Possible values include: 'AzureFiles', 'AzureBlob'.
+     *
+     * @return the type value
+     */
+    public AzureStorageType type() {
+        return this.type;
+    }
+
+    /**
+     * Set type of storage. Possible values include: 'AzureFiles', 'AzureBlob'.
+     *
+     * @param type the type value to set
+     * @return the AzureStorageInfoValue object itself.
+     */
+    public AzureStorageInfoValue withType(AzureStorageType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get name of the storage account.
+     *
+     * @return the accountName value
+     */
+    public String accountName() {
+        return this.accountName;
+    }
+
+    /**
+     * Set name of the storage account.
+     *
+     * @param accountName the accountName value to set
+     * @return the AzureStorageInfoValue object itself.
+     */
+    public AzureStorageInfoValue withAccountName(String accountName) {
+        this.accountName = accountName;
+        return this;
+    }
+
+    /**
+     * Get name of the file share (container name, for Blob storage).
+     *
+     * @return the shareName value
+     */
+    public String shareName() {
+        return this.shareName;
+    }
+
+    /**
+     * Set name of the file share (container name, for Blob storage).
+     *
+     * @param shareName the shareName value to set
+     * @return the AzureStorageInfoValue object itself.
+     */
+    public AzureStorageInfoValue withShareName(String shareName) {
+        this.shareName = shareName;
+        return this;
+    }
+
+    /**
+     * Get access key for the storage account.
+     *
+     * @return the accessKey value
+     */
+    public String accessKey() {
+        return this.accessKey;
+    }
+
+    /**
+     * Set access key for the storage account.
+     *
+     * @param accessKey the accessKey value to set
+     * @return the AzureStorageInfoValue object itself.
+     */
+    public AzureStorageInfoValue withAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+        return this;
+    }
+
+    /**
+     * Get path to mount the storage within the site's runtime environment.
+     *
+     * @return the mountPath value
+     */
+    public String mountPath() {
+        return this.mountPath;
+    }
+
+    /**
+     * Set path to mount the storage within the site's runtime environment.
+     *
+     * @param mountPath the mountPath value to set
+     * @return the AzureStorageInfoValue object itself.
+     */
+    public AzureStorageInfoValue withMountPath(String mountPath) {
+        this.mountPath = mountPath;
+        return this;
+    }
+
+    /**
+     * Get state of the storage account. Possible values include: 'Ok', 'InvalidCredentials', 'InvalidShare'.
+     *
+     * @return the state value
+     */
+    public AzureStorageState state() {
+        return this.state;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStoragePropertyDictionaryResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStoragePropertyDictionaryResource.java
new file mode 100644
index 000000000000..71efa1e251ab
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStoragePropertyDictionaryResource.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AzureStoragePropertyDictionaryResourceInner;
+import java.util.Map;
+
+/**
+ * Type representing AzureStoragePropertyDictionaryResource.
+ */
+public interface AzureStoragePropertyDictionaryResource extends HasInner<AzureStoragePropertyDictionaryResourceInner>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the properties value.
+     */
+    Map<String, AzureStorageInfoValue> properties();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageState.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageState.java
new file mode 100644
index 000000000000..f5dc6a73a874
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageState.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for AzureStorageState.
+ */
+public enum AzureStorageState {
+    /** Enum value Ok. */
+    OK("Ok"),
+
+    /** Enum value InvalidCredentials. */
+    INVALID_CREDENTIALS("InvalidCredentials"),
+
+    /** Enum value InvalidShare. */
+    INVALID_SHARE("InvalidShare");
+
+    /** The actual serialized value for a AzureStorageState instance. */
+    private String value;
+
+    AzureStorageState(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a AzureStorageState instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed AzureStorageState object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static AzureStorageState fromString(String value) {
+        AzureStorageState[] items = AzureStorageState.values();
+        for (AzureStorageState item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageType.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageType.java
new file mode 100644
index 000000000000..03c6d639c049
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/AzureStorageType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for AzureStorageType.
+ */
+public enum AzureStorageType {
+    /** Enum value AzureFiles. */
+    AZURE_FILES("AzureFiles"),
+
+    /** Enum value AzureBlob. */
+    AZURE_BLOB("AzureBlob");
+
+    /** The actual serialized value for a AzureStorageType instance. */
+    private String value;
+
+    AzureStorageType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a AzureStorageType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed AzureStorageType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static AzureStorageType fromString(String value) {
+        AzureStorageType[] items = AzureStorageType.values();
+        for (AzureStorageType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupItem.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupItem.java
index 767b07a6d612..2e187093296a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupItem.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupItem.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing BackupItem.
  */
-public interface BackupItem extends HasInner<BackupItemInner>, Indexable, Refreshable<BackupItem>, HasManager<AppServiceManager> {
+public interface BackupItem extends HasInner<BackupItemInner>, Indexable, Refreshable<BackupItem>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the backupId value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupRequest.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupRequest.java
index 85afa6e8bf61..360067ff27a6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupRequest.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/BackupRequest.java
@@ -10,14 +10,19 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.BackupRequestInner;
 import java.util.List;
 
 /**
  * Type representing BackupRequest.
  */
-public interface BackupRequest extends HasInner<BackupRequestInner>, HasManager<AppServiceManager> {
+public interface BackupRequest extends HasInner<BackupRequestInner>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the backupName value.
+     */
+    String backupName();
+
     /**
      * @return the backupSchedule value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Capability.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Capability.java
index 23ab99b93c69..981235c3bd29 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Capability.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Capability.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CapabilityInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing Capability.
  */
-public interface Capability extends HasInner<CapabilityInner>, HasManager<AppServiceManager> {
+public interface Capability extends HasInner<CapabilityInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the name value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Certificate.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Certificate.java
index bd1caf058e66..0785bb364122 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Certificate.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Certificate.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Certificate.
  */
-public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<AppServiceManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<AppServiceManager> {
+public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the cerBlob value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateEmail.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateEmail.java
index ec80ed12a7a7..ee41cf862967 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateEmail.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateEmail.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateEmailInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing CertificateEmail.
  */
-public interface CertificateEmail extends HasInner<CertificateEmailInner>, HasManager<AppServiceManager> {
+public interface CertificateEmail extends HasInner<CertificateEmailInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the emailId value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateOrderAction.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateOrderAction.java
index 685e37dba228..fb19f2476ace 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateOrderAction.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CertificateOrderAction.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateOrderActionInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing CertificateOrderAction.
  */
-public interface CertificateOrderAction extends HasInner<CertificateOrderActionInner>, HasManager<AppServiceManager> {
+public interface CertificateOrderAction extends HasInner<CertificateOrderActionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the actionType value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ConnectionStringDictionary.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ConnectionStringDictionary.java
index 8ea9f5b96d85..01ba2521405b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ConnectionStringDictionary.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ConnectionStringDictionary.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ConnectionStringDictionaryInner;
 import java.util.Map;
 
 /**
  * Type representing ConnectionStringDictionary.
  */
-public interface ConnectionStringDictionary extends HasInner<ConnectionStringDictionaryInner>, HasManager<AppServiceManager> {
+public interface ConnectionStringDictionary extends HasInner<ConnectionStringDictionaryInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ContinuousWebJob.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ContinuousWebJob.java
index 050f23d6af47..552176beb266 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ContinuousWebJob.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ContinuousWebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing ContinuousWebJob.
  */
-public interface ContinuousWebJob extends HasInner<ContinuousWebJobInner>, Indexable, Refreshable<ContinuousWebJob>, HasManager<AppServiceManager> {
+public interface ContinuousWebJob extends HasInner<ContinuousWebJobInner>, Indexable, Refreshable<ContinuousWebJob>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the detailedStatus value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmOperationDescription.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmOperationDescription.java
index 75a13a49e2e8..2079a4271065 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmOperationDescription.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmOperationDescription.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CsmOperationDescriptionInner;
 
 /**
  * Type representing CsmOperationDescription.
  */
-public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<AppServiceManager> {
+public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the display value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmPublishingProfileOptions.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmPublishingProfileOptions.java
index 9d6f9e7e6eb6..3c1d6d2b006a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmPublishingProfileOptions.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CsmPublishingProfileOptions.java
@@ -23,6 +23,12 @@ public class CsmPublishingProfileOptions {
     @JsonProperty(value = "format")
     private PublishingProfileFormat format;
 
+    /**
+     * Include the DisasterRecover endpoint if true.
+     */
+    @JsonProperty(value = "includeDisasterRecoveryEndpoints")
+    private Boolean includeDisasterRecoveryEndpoints;
+
     /**
      * Get name of the format. Valid values are:
      FileZilla3
@@ -49,4 +55,24 @@ public CsmPublishingProfileOptions withFormat(PublishingProfileFormat format) {
         return this;
     }
 
+    /**
+     * Get include the DisasterRecover endpoint if true.
+     *
+     * @return the includeDisasterRecoveryEndpoints value
+     */
+    public Boolean includeDisasterRecoveryEndpoints() {
+        return this.includeDisasterRecoveryEndpoints;
+    }
+
+    /**
+     * Set include the DisasterRecover endpoint if true.
+     *
+     * @param includeDisasterRecoveryEndpoints the includeDisasterRecoveryEndpoints value to set
+     * @return the CsmPublishingProfileOptions object itself.
+     */
+    public CsmPublishingProfileOptions withIncludeDisasterRecoveryEndpoints(Boolean includeDisasterRecoveryEndpoints) {
+        this.includeDisasterRecoveryEndpoints = includeDisasterRecoveryEndpoints;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CustomHostnameAnalysisResult.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CustomHostnameAnalysisResult.java
index 031ab18d82d5..44100102734c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CustomHostnameAnalysisResult.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/CustomHostnameAnalysisResult.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CustomHostnameAnalysisResultInner;
 import java.util.List;
 
 /**
  * Type representing CustomHostnameAnalysisResult.
  */
-public interface CustomHostnameAnalysisResult extends HasInner<CustomHostnameAnalysisResultInner>, HasManager<AppServiceManager> {
+public interface CustomHostnameAnalysisResult extends HasInner<CustomHostnameAnalysisResultInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the alternateCNameRecords value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseColumn.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseColumn.java
new file mode 100644
index 000000000000..cc15a423f05d
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseColumn.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Column definition.
+ */
+public class DataTableResponseColumn {
+    /**
+     * Name of the column.
+     */
+    @JsonProperty(value = "columnName")
+    private String columnName;
+
+    /**
+     * Data type which looks like 'String' or 'Int32'.
+     */
+    @JsonProperty(value = "dataType")
+    private String dataType;
+
+    /**
+     * Column Type.
+     */
+    @JsonProperty(value = "columnType")
+    private String columnType;
+
+    /**
+     * Get name of the column.
+     *
+     * @return the columnName value
+     */
+    public String columnName() {
+        return this.columnName;
+    }
+
+    /**
+     * Set name of the column.
+     *
+     * @param columnName the columnName value to set
+     * @return the DataTableResponseColumn object itself.
+     */
+    public DataTableResponseColumn withColumnName(String columnName) {
+        this.columnName = columnName;
+        return this;
+    }
+
+    /**
+     * Get data type which looks like 'String' or 'Int32'.
+     *
+     * @return the dataType value
+     */
+    public String dataType() {
+        return this.dataType;
+    }
+
+    /**
+     * Set data type which looks like 'String' or 'Int32'.
+     *
+     * @param dataType the dataType value to set
+     * @return the DataTableResponseColumn object itself.
+     */
+    public DataTableResponseColumn withDataType(String dataType) {
+        this.dataType = dataType;
+        return this;
+    }
+
+    /**
+     * Get column Type.
+     *
+     * @return the columnType value
+     */
+    public String columnType() {
+        return this.columnType;
+    }
+
+    /**
+     * Set column Type.
+     *
+     * @param columnType the columnType value to set
+     * @return the DataTableResponseColumn object itself.
+     */
+    public DataTableResponseColumn withColumnType(String columnType) {
+        this.columnType = columnType;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseObject.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseObject.java
new file mode 100644
index 000000000000..238fa91161cc
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DataTableResponseObject.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Data Table which defines columns and raw row values.
+ */
+public class DataTableResponseObject {
+    /**
+     * Name of the table.
+     */
+    @JsonProperty(value = "tableName")
+    private String tableName;
+
+    /**
+     * List of columns with data types.
+     */
+    @JsonProperty(value = "columns")
+    private List<DataTableResponseColumn> columns;
+
+    /**
+     * Raw row values.
+     */
+    @JsonProperty(value = "rows")
+    private List<List<String>> rows;
+
+    /**
+     * Get name of the table.
+     *
+     * @return the tableName value
+     */
+    public String tableName() {
+        return this.tableName;
+    }
+
+    /**
+     * Set name of the table.
+     *
+     * @param tableName the tableName value to set
+     * @return the DataTableResponseObject object itself.
+     */
+    public DataTableResponseObject withTableName(String tableName) {
+        this.tableName = tableName;
+        return this;
+    }
+
+    /**
+     * Get list of columns with data types.
+     *
+     * @return the columns value
+     */
+    public List<DataTableResponseColumn> columns() {
+        return this.columns;
+    }
+
+    /**
+     * Set list of columns with data types.
+     *
+     * @param columns the columns value to set
+     * @return the DataTableResponseObject object itself.
+     */
+    public DataTableResponseObject withColumns(List<DataTableResponseColumn> columns) {
+        this.columns = columns;
+        return this;
+    }
+
+    /**
+     * Get raw row values.
+     *
+     * @return the rows value
+     */
+    public List<List<String>> rows() {
+        return this.rows;
+    }
+
+    /**
+     * Set raw row values.
+     *
+     * @param rows the rows value to set
+     * @return the DataTableResponseObject object itself.
+     */
+    public DataTableResponseObject withRows(List<List<String>> rows) {
+        this.rows = rows;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DeletedSite.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DeletedSite.java
index 5b49e82a946b..e7045e609b75 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DeletedSite.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DeletedSite.java
@@ -10,18 +10,23 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DeletedSiteInner;
 
 /**
  * Type representing DeletedSite.
  */
-public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<AppServiceManager> {
+public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the deletedSiteId value.
      */
     Integer deletedSiteId();
 
+    /**
+     * @return the deletedSiteKind value.
+     */
+    String deletedSiteKind();
+
     /**
      * @return the deletedSiteName value.
      */
@@ -32,6 +37,21 @@ public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<AppS
      */
     String deletedTimestamp();
 
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
     /**
      * @return the resourceGroup value.
      */
@@ -47,4 +67,9 @@ public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<AppS
      */
     String subscription();
 
+    /**
+     * @return the type value.
+     */
+    String type();
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Deployment.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Deployment.java
index 6ab777390f2c..ef91bd00da7b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Deployment.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Deployment.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing Deployment.
  */
-public interface Deployment extends HasInner<DeploymentInner>, Indexable, Refreshable<Deployment>, Updatable<Deployment.Update>, HasManager<AppServiceManager> {
+public interface Deployment extends HasInner<DeploymentInner>, Indexable, Refreshable<Deployment>, Updatable<Deployment.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the active value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorDefinition.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorDefinition.java
index 638a8e95c97c..a2f9a8ef0804 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorDefinition.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorDefinition.java
@@ -9,14 +9,14 @@
 package com.microsoft.azure.management.appservice.v2018_02_01;
 
 import com.microsoft.azure.arm.model.HasInner;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DetectorDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DetectorDefinitionInner;
 
 /**
  * Type representing DetectorDefinition.
  */
-public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<AppServiceManager> {
+public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorInfo.java
new file mode 100644
index 000000000000..19a96f45a8c4
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorInfo.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Definition of Detector.
+ */
+public class DetectorInfo {
+    /**
+     * Short description of the detector and its purpose.
+     */
+    @JsonProperty(value = "description", access = JsonProperty.Access.WRITE_ONLY)
+    private String description;
+
+    /**
+     * Support Category.
+     */
+    @JsonProperty(value = "category", access = JsonProperty.Access.WRITE_ONLY)
+    private String category;
+
+    /**
+     * Support Sub Category.
+     */
+    @JsonProperty(value = "subCategory", access = JsonProperty.Access.WRITE_ONLY)
+    private String subCategory;
+
+    /**
+     * Support Topic Id.
+     */
+    @JsonProperty(value = "supportTopicId", access = JsonProperty.Access.WRITE_ONLY)
+    private String supportTopicId;
+
+    /**
+     * Get short description of the detector and its purpose.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Get support Category.
+     *
+     * @return the category value
+     */
+    public String category() {
+        return this.category;
+    }
+
+    /**
+     * Get support Sub Category.
+     *
+     * @return the subCategory value
+     */
+    public String subCategory() {
+        return this.subCategory;
+    }
+
+    /**
+     * Get support Topic Id.
+     *
+     * @return the supportTopicId value
+     */
+    public String supportTopicId() {
+        return this.supportTopicId;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorResponse.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorResponse.java
new file mode 100644
index 000000000000..ed159c18dac9
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DetectorResponse.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DetectorResponseInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import java.util.List;
+
+/**
+ * Type representing DetectorResponse.
+ */
+public interface DetectorResponse extends HasInner<DetectorResponseInner>, Indexable, Refreshable<DetectorResponse>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the dataset value.
+     */
+    List<DiagnosticData> dataset();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the metadata value.
+     */
+    DetectorInfo metadata();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticAnalysis.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticAnalysis.java
index f979b6bc9ecc..7cb6a430b082 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticAnalysis.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticAnalysis.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 
 /**
  * Type representing DiagnosticAnalysis.
  */
-public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<AppServiceManager> {
+public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticCategory.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticCategory.java
index 615f401d1582..64ac78b6eb98 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticCategory.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticCategory.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing DiagnosticCategory.
  */
-public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<AppServiceManager> {
+public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticData.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticData.java
new file mode 100644
index 000000000000..d91eb183e5af
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticData.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Set of data with rendering instructions.
+ */
+public class DiagnosticData {
+    /**
+     * Data in table form.
+     */
+    @JsonProperty(value = "table")
+    private DataTableResponseObject table;
+
+    /**
+     * Properties that describe how the table should be rendered.
+     */
+    @JsonProperty(value = "renderingProperties")
+    private Rendering renderingProperties;
+
+    /**
+     * Get data in table form.
+     *
+     * @return the table value
+     */
+    public DataTableResponseObject table() {
+        return this.table;
+    }
+
+    /**
+     * Set data in table form.
+     *
+     * @param table the table value to set
+     * @return the DiagnosticData object itself.
+     */
+    public DiagnosticData withTable(DataTableResponseObject table) {
+        this.table = table;
+        return this;
+    }
+
+    /**
+     * Get properties that describe how the table should be rendered.
+     *
+     * @return the renderingProperties value
+     */
+    public Rendering renderingProperties() {
+        return this.renderingProperties;
+    }
+
+    /**
+     * Set properties that describe how the table should be rendered.
+     *
+     * @param renderingProperties the renderingProperties value to set
+     * @return the DiagnosticData object itself.
+     */
+    public DiagnosticData withRenderingProperties(Rendering renderingProperties) {
+        this.renderingProperties = renderingProperties;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticDetectorResponse.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticDetectorResponse.java
index 1f014fdfe5a7..84ef6f100a98 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticDetectorResponse.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DiagnosticDetectorResponse.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DiagnosticDetectorResponseInner;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DetectorDefinitionInner;
@@ -19,7 +19,7 @@
 /**
  * Type representing DiagnosticDetectorResponse.
  */
-public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<AppServiceManager> {
+public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Diagnostics.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Diagnostics.java
index c4de12c4c06d..ddd647770c97 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Diagnostics.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Diagnostics.java
@@ -11,8 +11,8 @@
 import rx.Observable;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DiagnosticsInner;
 import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.appservice.v2018_02_01.DetectorResponse;
 import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticAnalysis;
-import com.microsoft.azure.management.appservice.v2018_02_01.DetectorDefinition;
 
 /**
  * Type representing Diagnostics.
@@ -67,83 +67,113 @@ public interface Diagnostics extends HasInner<DiagnosticsInner> {
     Observable<DiagnosticCategory> listSiteDiagnosticCategoriesAsync(final String resourceGroupName, final String siteName);
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticAnalysis> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName);
+    Observable<DetectorResponse> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName);
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Site Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DetectorResponse> listHostingEnvironmentDetectorResponsesAsync(final String resourceGroupName, final String name);
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticAnalysis> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory);
+    Observable<DetectorResponse> listSiteDetectorResponsesAsync(final String resourceGroupName, final String siteName);
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticAnalysis> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName);
+    Observable<DetectorResponse> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName);
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * Get Detectors.
+     * Get Detectors.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
-     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<AnalysisDefinition> listSiteAnalysesSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot);
+    Observable<DetectorDefinition> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory);
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get Detector.
+     * Get Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
-     * @param slot Slot - optional
+     * @param detectorName Detector Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticAnalysis> getSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot);
+    Observable<DetectorDefinition> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName);
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
+     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DiagnosticDetectorResponse> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory);
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
      * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticAnalysis> executeSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot);
+    Observable<DetectorResponse> listSiteDetectorResponsesSlotAsync(final String resourceGroupName, final String siteName, final String slot);
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @param slot Slot Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DetectorResponse> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot);
 
     /**
      * Get Detectors.
@@ -152,10 +182,11 @@ public interface Diagnostics extends HasInner<DiagnosticsInner> {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DetectorDefinition> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory);
+    Observable<DetectorDefinition> listSiteDetectorsSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot);
 
     /**
      * Get Detector.
@@ -165,10 +196,11 @@ public interface Diagnostics extends HasInner<DiagnosticsInner> {
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
      * @param detectorName Detector Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DetectorDefinition> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName);
+    Observable<DetectorDefinition> getSiteDetectorSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName, final String slot);
 
     /**
      * Execute Detector.
@@ -178,50 +210,89 @@ public interface Diagnostics extends HasInner<DiagnosticsInner> {
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticDetectorResponse> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory);
+    Observable<DiagnosticDetectorResponse> executeSiteDetectorSlotAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, String slot);
 
     /**
-     * Get Detectors.
-     * Get Detectors.
+     * Get Site Analysis.
+     * Get Site Analysis.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
-     * @param slot Slot Name
+     * @param analysisName Analysis Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DetectorDefinition> listSiteDetectorsSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot);
+    Observable<DiagnosticAnalysis> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName);
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DiagnosticAnalysis> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory);
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DiagnosticAnalysis> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName);
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
-     * @param detectorName Detector Name
      * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DetectorDefinition> getSiteDetectorSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName, final String slot);
+    Observable<AnalysisDefinition> listSiteAnalysesSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot);
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get Site Analysis.
+     * Get Site Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param analysisName Analysis Name
+     * @param slot Slot - optional
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<DiagnosticAnalysis> getSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot);
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
      * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DiagnosticDetectorResponse> executeSiteDetectorSlotAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, String slot);
+    Observable<DiagnosticAnalysis> executeSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot);
 
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Domain.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Domain.java
index 1b71ca7e20e1..d047dc3fa7c9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Domain.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Domain.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DomainInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Domain.
  */
-public interface Domain extends HasInner<DomainInner>, Resource, GroupableResourceCore<AppServiceManager, DomainInner>, HasResourceGroup, Refreshable<Domain>, Updatable<Domain.Update>, HasManager<AppServiceManager> {
+public interface Domain extends HasInner<DomainInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, DomainInner>, HasResourceGroup, Refreshable<Domain>, Updatable<Domain.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the authCode value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainAvailablilityCheckResult.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainAvailablilityCheckResult.java
index fdddfb5068c4..704e75dc5f8a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainAvailablilityCheckResult.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainAvailablilityCheckResult.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DomainAvailablilityCheckResultInner;
 
 /**
  * Type representing DomainAvailablilityCheckResult.
  */
-public interface DomainAvailablilityCheckResult extends HasInner<DomainAvailablilityCheckResultInner>, HasManager<AppServiceManager> {
+public interface DomainAvailablilityCheckResult extends HasInner<DomainAvailablilityCheckResultInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the available value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainControlCenterSsoRequest.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainControlCenterSsoRequest.java
index cfb1bbcec617..1350e5ed2ce2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainControlCenterSsoRequest.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainControlCenterSsoRequest.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.DomainControlCenterSsoRequestInner;
 
 /**
  * Type representing DomainControlCenterSsoRequest.
  */
-public interface DomainControlCenterSsoRequest extends HasInner<DomainControlCenterSsoRequestInner>, HasManager<AppServiceManager> {
+public interface DomainControlCenterSsoRequest extends HasInner<DomainControlCenterSsoRequestInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the postParameterKey value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainOwnershipIdentifier.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainOwnershipIdentifier.java
index 659c1f12a4f8..c38ad554a8e8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainOwnershipIdentifier.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/DomainOwnershipIdentifier.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing DomainOwnershipIdentifier.
  */
-public interface DomainOwnershipIdentifier extends HasInner<DomainOwnershipIdentifierInner>, Indexable, Refreshable<DomainOwnershipIdentifier>, Updatable<DomainOwnershipIdentifier.Update>, HasManager<AppServiceManager> {
+public interface DomainOwnershipIdentifier extends HasInner<DomainOwnershipIdentifierInner>, Indexable, Refreshable<DomainOwnershipIdentifier>, Updatable<DomainOwnershipIdentifier.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionEnvelope.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionEnvelope.java
index 2ff1e6647a5f..167751f9ca0d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionEnvelope.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionEnvelope.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing FunctionEnvelope.
  */
-public interface FunctionEnvelope extends HasInner<FunctionEnvelopeInner>, Indexable, Refreshable<FunctionEnvelope>, Updatable<FunctionEnvelope.Update>, HasManager<AppServiceManager> {
+public interface FunctionEnvelope extends HasInner<FunctionEnvelopeInner>, Indexable, Refreshable<FunctionEnvelope>, Updatable<FunctionEnvelope.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the config value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionSecrets.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionSecrets.java
index c31a088abe07..db58fe9e4c10 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionSecrets.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/FunctionSecrets.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.FunctionSecretsInner;
 
 /**
  * Type representing FunctionSecrets.
  */
-public interface FunctionSecrets extends HasInner<FunctionSecretsInner>, HasManager<AppServiceManager> {
+public interface FunctionSecrets extends HasInner<FunctionSecretsInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostNameBinding.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostNameBinding.java
index f9369fb2ff9d..aa935c7275f7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostNameBinding.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostNameBinding.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing HostNameBinding.
  */
-public interface HostNameBinding extends HasInner<HostNameBindingInner>, Indexable, Refreshable<HostNameBinding>, Updatable<HostNameBinding.Update>, HasManager<AppServiceManager> {
+public interface HostNameBinding extends HasInner<HostNameBindingInner>, Indexable, Refreshable<HostNameBinding>, Updatable<HostNameBinding.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the azureResourceName value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentAppServicePlan.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentAppServicePlan.java
index 3f7087744142..ecbb65f08e57 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentAppServicePlan.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentAppServicePlan.java
@@ -11,19 +11,24 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServicePlanInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.Map;
 
 /**
  * Type representing HostingEnvironmentAppServicePlan.
  */
-public interface HostingEnvironmentAppServicePlan extends HasInner<AppServicePlanInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentAppServicePlan extends HasInner<AppServicePlanInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the adminSiteName value.
      */
     String adminSiteName();
 
+    /**
+     * @return the freeOfferExpirationTime value.
+     */
+    DateTime freeOfferExpirationTime();
+
     /**
      * @return the geoRegion value.
      */
@@ -34,6 +39,11 @@ public interface HostingEnvironmentAppServicePlan extends HasInner<AppServicePla
      */
     HostingEnvironmentProfile hostingEnvironmentProfile();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentDiagnostics.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentDiagnostics.java
index 66d70c20a4b2..8c1052663a61 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentDiagnostics.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentDiagnostics.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.HostingEnvironmentDiagnosticsInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing HostingEnvironmentDiagnostics.
  */
-public interface HostingEnvironmentDiagnostics extends HasInner<HostingEnvironmentDiagnosticsInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentDiagnostics extends HasInner<HostingEnvironmentDiagnosticsInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the diagnosicsOutput value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentResourceMetric.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentResourceMetric.java
index 270ab243bb12..4000ce222039 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentResourceMetric.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing HostingEnvironmentResourceMetric.
  */
-public interface HostingEnvironmentResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentResourceMetric extends HasInner<ResourceMetricInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentSite.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentSite.java
index bc231f519957..916633776fd8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentSite.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HostingEnvironmentSite.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -19,7 +19,7 @@
 /**
  * Type representing HostingEnvironmentSite.
  */
-public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<AppServiceManager> {
+public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the availabilityState value.
      */
@@ -90,6 +90,11 @@ public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<
      */
     Boolean httpsOnly();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the id value.
      */
@@ -180,11 +185,6 @@ public interface HostingEnvironmentSite extends HasInner<SiteInner>, HasManager<
      */
     SlotSwapStatus slotSwapStatus();
 
-    /**
-     * @return the snapshotInfo value.
-     */
-    SnapshotRecoveryRequest snapshotInfo();
-
     /**
      * @return the state value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnection.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnection.java
index 7c1d69cb39c7..662865acec05 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnection.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnection.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.HybridConnectionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing HybridConnection.
  */
-public interface HybridConnection extends HasInner<HybridConnectionInner>, HasManager<AppServiceManager> {
+public interface HybridConnection extends HasInner<HybridConnectionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the hostname value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionKey.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionKey.java
index a63a0d3dea9d..602f5be8f32e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionKey.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionKey.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.HybridConnectionKeyInner;
 
 /**
  * Type representing HybridConnectionKey.
  */
-public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<AppServiceManager> {
+public interface HybridConnectionKey extends HasInner<HybridConnectionKeyInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionLimits.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionLimits.java
index 3d16b67896f7..fdcc598612c8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionLimits.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/HybridConnectionLimits.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.HybridConnectionLimitsInner;
 
 /**
  * Type representing HybridConnectionLimits.
  */
-public interface HybridConnectionLimits extends HasInner<HybridConnectionLimitsInner>, HasManager<AppServiceManager> {
+public interface HybridConnectionLimits extends HasInner<HybridConnectionLimitsInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the current value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Identifier.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Identifier.java
index 34109d15b4d8..72d85587d15c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Identifier.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Identifier.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing Identifier.
  */
-public interface Identifier extends HasInner<IdentifierInner>, Indexable, Refreshable<Identifier>, Updatable<Identifier.Update>, HasManager<AppServiceManager> {
+public interface Identifier extends HasInner<IdentifierInner>, Indexable, Refreshable<Identifier>, Updatable<Identifier.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpFilterTag.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpFilterTag.java
new file mode 100644
index 000000000000..ff8d8c66cdd1
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpFilterTag.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for IpFilterTag.
+ */
+public enum IpFilterTag {
+    /** Enum value Default. */
+    DEFAULT("Default"),
+
+    /** Enum value XffProxy. */
+    XFF_PROXY("XffProxy");
+
+    /** The actual serialized value for a IpFilterTag instance. */
+    private String value;
+
+    IpFilterTag(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a IpFilterTag instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed IpFilterTag object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static IpFilterTag fromString(String value) {
+        IpFilterTag[] items = IpFilterTag.values();
+        for (IpFilterTag item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpSecurityRestriction.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpSecurityRestriction.java
index 6e6a2979f2e8..cc97f0e966d6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpSecurityRestriction.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/IpSecurityRestriction.java
@@ -16,6 +16,9 @@
 public class IpSecurityRestriction {
     /**
      * IP address the security restriction is valid for.
+     * It can be in form of pure ipv4 address (required SubnetMask property) or
+     * CIDR notation such as ipv4/mask (leading bit match). For CIDR,
+     * SubnetMask property must not be specified.
      */
     @JsonProperty(value = "ipAddress", required = true)
     private String ipAddress;
@@ -26,8 +29,42 @@ public class IpSecurityRestriction {
     @JsonProperty(value = "subnetMask")
     private String subnetMask;
 
+    /**
+     * Allow or Deny access for this IP range.
+     */
+    @JsonProperty(value = "action")
+    private String action;
+
+    /**
+     * Defines what this IP filter will be used for. This is to support IP
+     * filtering on proxies. Possible values include: 'Default', 'XffProxy'.
+     */
+    @JsonProperty(value = "tag")
+    private IpFilterTag tag;
+
+    /**
+     * Priority of IP restriction rule.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * IP restriction rule name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * IP restriction rule description.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
     /**
      * Get iP address the security restriction is valid for.
+     It can be in form of pure ipv4 address (required SubnetMask property) or
+     CIDR notation such as ipv4/mask (leading bit match). For CIDR,
+     SubnetMask property must not be specified.
      *
      * @return the ipAddress value
      */
@@ -37,6 +74,9 @@ public String ipAddress() {
 
     /**
      * Set iP address the security restriction is valid for.
+     It can be in form of pure ipv4 address (required SubnetMask property) or
+     CIDR notation such as ipv4/mask (leading bit match). For CIDR,
+     SubnetMask property must not be specified.
      *
      * @param ipAddress the ipAddress value to set
      * @return the IpSecurityRestriction object itself.
@@ -66,4 +106,104 @@ public IpSecurityRestriction withSubnetMask(String subnetMask) {
         return this;
     }
 
+    /**
+     * Get allow or Deny access for this IP range.
+     *
+     * @return the action value
+     */
+    public String action() {
+        return this.action;
+    }
+
+    /**
+     * Set allow or Deny access for this IP range.
+     *
+     * @param action the action value to set
+     * @return the IpSecurityRestriction object itself.
+     */
+    public IpSecurityRestriction withAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * Get defines what this IP filter will be used for. This is to support IP filtering on proxies. Possible values include: 'Default', 'XffProxy'.
+     *
+     * @return the tag value
+     */
+    public IpFilterTag tag() {
+        return this.tag;
+    }
+
+    /**
+     * Set defines what this IP filter will be used for. This is to support IP filtering on proxies. Possible values include: 'Default', 'XffProxy'.
+     *
+     * @param tag the tag value to set
+     * @return the IpSecurityRestriction object itself.
+     */
+    public IpSecurityRestriction withTag(IpFilterTag tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    /**
+     * Get priority of IP restriction rule.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set priority of IP restriction rule.
+     *
+     * @param priority the priority value to set
+     * @return the IpSecurityRestriction object itself.
+     */
+    public IpSecurityRestriction withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get iP restriction rule name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set iP restriction rule name.
+     *
+     * @param name the name value to set
+     * @return the IpSecurityRestriction object itself.
+     */
+    public IpSecurityRestriction withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get iP restriction rule description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set iP restriction rule description.
+     *
+     * @param description the description value to set
+     * @return the IpSecurityRestriction object itself.
+     */
+    public IpSecurityRestriction withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/LogSpecification.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/LogSpecification.java
new file mode 100644
index 000000000000..fd0a2961ccf0
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/LogSpecification.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Log Definition of a single resource metric.
+ */
+public class LogSpecification {
+    /**
+     * The name property.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The displayName property.
+     */
+    @JsonProperty(value = "displayName")
+    private String displayName;
+
+    /**
+     * The blobDuration property.
+     */
+    @JsonProperty(value = "blobDuration")
+    private String blobDuration;
+
+    /**
+     * Get the name value.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name value.
+     *
+     * @param name the name value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the displayName value.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the displayName value.
+     *
+     * @param displayName the displayName value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the blobDuration value.
+     *
+     * @return the blobDuration value
+     */
+    public String blobDuration() {
+        return this.blobDuration;
+    }
+
+    /**
+     * Set the blobDuration value.
+     *
+     * @param blobDuration the blobDuration value to set
+     * @return the LogSpecification object itself.
+     */
+    public LogSpecification withBlobDuration(String blobDuration) {
+        this.blobDuration = blobDuration;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeploy.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeploy.java
index 5e2d54a11fc6..ad4b8a1325a5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeploy.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeploy.java
@@ -9,6 +9,7 @@
 package com.microsoft.azure.management.appservice.v2018_02_01;
 
 import java.util.Map;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 
@@ -66,6 +67,13 @@ public class MSDeploy extends ProxyOnlyResource {
     @JsonProperty(value = "properties.appOffline")
     private Boolean appOffline;
 
+    /**
+     * List of Add-On packages. Add-On packages implicitly enable the Do Not
+     * Delete MSDeploy rule.
+     */
+    @JsonProperty(value = "properties.addOnPackages")
+    private List<MSDeployCore> addOnPackages;
+
     /**
      * Get package URI.
      *
@@ -214,4 +222,24 @@ public MSDeploy withAppOffline(Boolean appOffline) {
         return this;
     }
 
+    /**
+     * Get list of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.
+     *
+     * @return the addOnPackages value
+     */
+    public List<MSDeployCore> addOnPackages() {
+        return this.addOnPackages;
+    }
+
+    /**
+     * Set list of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.
+     *
+     * @param addOnPackages the addOnPackages value to set
+     * @return the MSDeploy object itself.
+     */
+    public MSDeploy withAddOnPackages(List<MSDeployCore> addOnPackages) {
+        this.addOnPackages = addOnPackages;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployCore.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployCore.java
new file mode 100644
index 000000000000..c9e6cba30162
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployCore.java
@@ -0,0 +1,215 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * MSDeploy ARM PUT core information.
+ */
+public class MSDeployCore {
+    /**
+     * Package URI.
+     */
+    @JsonProperty(value = "packageUri")
+    private String packageUri;
+
+    /**
+     * SQL Connection String.
+     */
+    @JsonProperty(value = "connectionString")
+    private String connectionString;
+
+    /**
+     * Database Type.
+     */
+    @JsonProperty(value = "dbType")
+    private String dbType;
+
+    /**
+     * URI of MSDeploy Parameters file. Must not be set if SetParameters is
+     * used.
+     */
+    @JsonProperty(value = "setParametersXmlFileUri")
+    private String setParametersXmlFileUri;
+
+    /**
+     * MSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     */
+    @JsonProperty(value = "setParameters")
+    private Map<String, String> setParameters;
+
+    /**
+     * Controls whether the MSDeploy operation skips the App_Data directory.
+     * If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory
+     * on the destination
+     * will not be deleted, and any App_Data directory in the source will be
+     * ignored.
+     * Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     */
+    @JsonProperty(value = "skipAppData")
+    private Boolean skipAppData;
+
+    /**
+     * Sets the AppOffline rule while the MSDeploy operation executes.
+     * Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     */
+    @JsonProperty(value = "appOffline")
+    private Boolean appOffline;
+
+    /**
+     * Get package URI.
+     *
+     * @return the packageUri value
+     */
+    public String packageUri() {
+        return this.packageUri;
+    }
+
+    /**
+     * Set package URI.
+     *
+     * @param packageUri the packageUri value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withPackageUri(String packageUri) {
+        this.packageUri = packageUri;
+        return this;
+    }
+
+    /**
+     * Get sQL Connection String.
+     *
+     * @return the connectionString value
+     */
+    public String connectionString() {
+        return this.connectionString;
+    }
+
+    /**
+     * Set sQL Connection String.
+     *
+     * @param connectionString the connectionString value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withConnectionString(String connectionString) {
+        this.connectionString = connectionString;
+        return this;
+    }
+
+    /**
+     * Get database Type.
+     *
+     * @return the dbType value
+     */
+    public String dbType() {
+        return this.dbType;
+    }
+
+    /**
+     * Set database Type.
+     *
+     * @param dbType the dbType value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withDbType(String dbType) {
+        this.dbType = dbType;
+        return this;
+    }
+
+    /**
+     * Get uRI of MSDeploy Parameters file. Must not be set if SetParameters is used.
+     *
+     * @return the setParametersXmlFileUri value
+     */
+    public String setParametersXmlFileUri() {
+        return this.setParametersXmlFileUri;
+    }
+
+    /**
+     * Set uRI of MSDeploy Parameters file. Must not be set if SetParameters is used.
+     *
+     * @param setParametersXmlFileUri the setParametersXmlFileUri value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSetParametersXmlFileUri(String setParametersXmlFileUri) {
+        this.setParametersXmlFileUri = setParametersXmlFileUri;
+        return this;
+    }
+
+    /**
+     * Get mSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     *
+     * @return the setParameters value
+     */
+    public Map<String, String> setParameters() {
+        return this.setParameters;
+    }
+
+    /**
+     * Set mSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.
+     *
+     * @param setParameters the setParameters value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSetParameters(Map<String, String> setParameters) {
+        this.setParameters = setParameters;
+        return this;
+    }
+
+    /**
+     * Get controls whether the MSDeploy operation skips the App_Data directory.
+     If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory on the destination
+     will not be deleted, and any App_Data directory in the source will be ignored.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @return the skipAppData value
+     */
+    public Boolean skipAppData() {
+        return this.skipAppData;
+    }
+
+    /**
+     * Set controls whether the MSDeploy operation skips the App_Data directory.
+     If set to &lt;code&gt;true&lt;/code&gt;, the existing App_Data directory on the destination
+     will not be deleted, and any App_Data directory in the source will be ignored.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @param skipAppData the skipAppData value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withSkipAppData(Boolean skipAppData) {
+        this.skipAppData = skipAppData;
+        return this;
+    }
+
+    /**
+     * Get sets the AppOffline rule while the MSDeploy operation executes.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @return the appOffline value
+     */
+    public Boolean appOffline() {
+        return this.appOffline;
+    }
+
+    /**
+     * Set sets the AppOffline rule while the MSDeploy operation executes.
+     Setting is &lt;code&gt;false&lt;/code&gt; by default.
+     *
+     * @param appOffline the appOffline value to set
+     * @return the MSDeployCore object itself.
+     */
+    public MSDeployCore withAppOffline(Boolean appOffline) {
+        this.appOffline = appOffline;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployLog.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployLog.java
index 7026d00407a0..ce807b818259 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployLog.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployLog.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.MSDeployLogInner;
 import java.util.List;
 
 /**
  * Type representing MSDeployLog.
  */
-public interface MSDeployLog extends HasInner<MSDeployLogInner>, HasManager<AppServiceManager> {
+public interface MSDeployLog extends HasInner<MSDeployLogInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the entries value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployStatus.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployStatus.java
index 8ae502a3dd96..66259d74e85b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployStatus.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MSDeployStatus.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.MSDeployStatusInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing MSDeployStatus.
  */
-public interface MSDeployStatus extends HasInner<MSDeployStatusInner>, HasManager<AppServiceManager> {
+public interface MSDeployStatus extends HasInner<MSDeployStatusInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the complete value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MetricDefinition.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MetricDefinition.java
index 89cb698b0952..8169af713749 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MetricDefinition.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MetricDefinition.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.MetricDefinitionInner;
 import java.util.List;
 
 /**
  * Type representing MetricDefinition.
  */
-public interface MetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface MetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the displayName value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MigrateMySqlStatus.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MigrateMySqlStatus.java
index 98954e9580ac..bc3d7468c4b0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MigrateMySqlStatus.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MigrateMySqlStatus.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.MigrateMySqlStatusInner;
 
 /**
  * Type representing MigrateMySqlStatus.
  */
-public interface MigrateMySqlStatus extends HasInner<MigrateMySqlStatusInner>, HasManager<AppServiceManager> {
+public interface MigrateMySqlStatus extends HasInner<MigrateMySqlStatusInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MultiRolePools.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MultiRolePools.java
index df44cd54eb88..addf3c5ecf61 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MultiRolePools.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/MultiRolePools.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.WorkerPoolResourceInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 
 /**
  * Type representing MultiRolePools.
  */
-public interface MultiRolePools extends HasInner<WorkerPoolResourceInner>, HasManager<AppServiceManager> {
+public interface MultiRolePools extends HasInner<WorkerPoolResourceInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NameIdentifier.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NameIdentifier.java
index 15b3955be369..da9e7bf23fbb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NameIdentifier.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NameIdentifier.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.NameIdentifierInner;
 
 /**
  * Type representing NameIdentifier.
  */
-public interface NameIdentifier extends HasInner<NameIdentifierInner>, HasManager<AppServiceManager> {
+public interface NameIdentifier extends HasInner<NameIdentifierInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the name value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkFeatures.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkFeatures.java
index 0272b459e50c..c5d29470d8ed 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkFeatures.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkFeatures.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 
 /**
  * Type representing NetworkFeatures.
  */
-public interface NetworkFeatures extends HasInner<NetworkFeaturesInner>, Indexable, Refreshable<NetworkFeatures>, HasManager<AppServiceManager> {
+public interface NetworkFeatures extends HasInner<NetworkFeaturesInner>, Indexable, Refreshable<NetworkFeatures>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the hybridConnections value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkTrace.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkTrace.java
new file mode 100644
index 000000000000..ef4e48f52b4e
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/NetworkTrace.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.NetworkTraceInner;
+
+/**
+ * Type representing NetworkTrace.
+ */
+public interface NetworkTrace extends HasInner<NetworkTraceInner>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the message value.
+     */
+    String message();
+
+    /**
+     * @return the path value.
+     */
+    String path();
+
+    /**
+     * @return the status value.
+     */
+    String status();
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Operation.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Operation.java
index a484cd157dbc..451eb1d2a89e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Operation.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Operation.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.OperationInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.List;
 import java.util.UUID;
@@ -19,7 +19,7 @@
 /**
  * Type representing Operation.
  */
-public interface Operation extends HasInner<OperationInner>, HasManager<AppServiceManager> {
+public interface Operation extends HasInner<OperationInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the createdTime value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PerfMonResponse.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PerfMonResponse.java
index 3ceac9152bb4..1c6659294dfd 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PerfMonResponse.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PerfMonResponse.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PerfMonResponseInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing PerfMonResponse.
  */
-public interface PerfMonResponse extends HasInner<PerfMonResponseInner>, HasManager<AppServiceManager> {
+public interface PerfMonResponse extends HasInner<PerfMonResponseInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the code value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOn.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOn.java
index 80132a119ad1..97ec19187061 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOn.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOn.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing PremierAddOn.
  */
-public interface PremierAddOn extends HasInner<PremierAddOnInner>, Indexable, Refreshable<PremierAddOn>, Updatable<PremierAddOn.Update>, HasManager<AppServiceManager> {
+public interface PremierAddOn extends HasInner<PremierAddOnInner>, Indexable, Refreshable<PremierAddOn>, Updatable<PremierAddOn.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
@@ -195,7 +195,7 @@ interface WithCreate extends Creatable<PremierAddOn>, DefinitionStages.WithKind,
     /**
      * The template for a PremierAddOn update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<PremierAddOn>, UpdateStages.WithKind, UpdateStages.WithMarketplaceOffer, UpdateStages.WithMarketplacePublisher, UpdateStages.WithProduct, UpdateStages.WithSku, UpdateStages.WithTags, UpdateStages.WithVendor {
+    interface Update extends Appliable<PremierAddOn>, UpdateStages.WithKind, UpdateStages.WithMarketplaceOffer, UpdateStages.WithMarketplacePublisher, UpdateStages.WithProduct, UpdateStages.WithSku, UpdateStages.WithVendor {
     }
 
     /**
@@ -252,16 +252,6 @@ interface WithSku {
             Update withSku(String sku);
         }
 
-        /**
-         * The stage of the premieraddon update allowing to specify Tags.
-         */
-        interface WithTags {
-            /**
-             * Specifies tags.
-             */
-            Update withTags(Map<String, String> tags);
-        }
-
         /**
          * The stage of the premieraddon update allowing to specify Vendor.
          */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOnPatchResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOnPatchResource.java
new file mode 100644
index 000000000000..bfedd7eda264
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PremierAddOnPatchResource.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * ARM resource for a PremierAddOn.
+ */
+@JsonFlatten
+public class PremierAddOnPatchResource extends ProxyOnlyResource {
+    /**
+     * Premier add on SKU.
+     */
+    @JsonProperty(value = "properties.sku")
+    private String sku;
+
+    /**
+     * Premier add on Product.
+     */
+    @JsonProperty(value = "properties.product")
+    private String product;
+
+    /**
+     * Premier add on Vendor.
+     */
+    @JsonProperty(value = "properties.vendor")
+    private String vendor;
+
+    /**
+     * Premier add on Marketplace publisher.
+     */
+    @JsonProperty(value = "properties.marketplacePublisher")
+    private String marketplacePublisher;
+
+    /**
+     * Premier add on Marketplace offer.
+     */
+    @JsonProperty(value = "properties.marketplaceOffer")
+    private String marketplaceOffer;
+
+    /**
+     * Get premier add on SKU.
+     *
+     * @return the sku value
+     */
+    public String sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set premier add on SKU.
+     *
+     * @param sku the sku value to set
+     * @return the PremierAddOnPatchResource object itself.
+     */
+    public PremierAddOnPatchResource withSku(String sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get premier add on Product.
+     *
+     * @return the product value
+     */
+    public String product() {
+        return this.product;
+    }
+
+    /**
+     * Set premier add on Product.
+     *
+     * @param product the product value to set
+     * @return the PremierAddOnPatchResource object itself.
+     */
+    public PremierAddOnPatchResource withProduct(String product) {
+        this.product = product;
+        return this;
+    }
+
+    /**
+     * Get premier add on Vendor.
+     *
+     * @return the vendor value
+     */
+    public String vendor() {
+        return this.vendor;
+    }
+
+    /**
+     * Set premier add on Vendor.
+     *
+     * @param vendor the vendor value to set
+     * @return the PremierAddOnPatchResource object itself.
+     */
+    public PremierAddOnPatchResource withVendor(String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+    /**
+     * Get premier add on Marketplace publisher.
+     *
+     * @return the marketplacePublisher value
+     */
+    public String marketplacePublisher() {
+        return this.marketplacePublisher;
+    }
+
+    /**
+     * Set premier add on Marketplace publisher.
+     *
+     * @param marketplacePublisher the marketplacePublisher value to set
+     * @return the PremierAddOnPatchResource object itself.
+     */
+    public PremierAddOnPatchResource withMarketplacePublisher(String marketplacePublisher) {
+        this.marketplacePublisher = marketplacePublisher;
+        return this;
+    }
+
+    /**
+     * Get premier add on Marketplace offer.
+     *
+     * @return the marketplaceOffer value
+     */
+    public String marketplaceOffer() {
+        return this.marketplaceOffer;
+    }
+
+    /**
+     * Set premier add on Marketplace offer.
+     *
+     * @param marketplaceOffer the marketplaceOffer value to set
+     * @return the PremierAddOnPatchResource object itself.
+     */
+    public PremierAddOnPatchResource withMarketplaceOffer(String marketplaceOffer) {
+        this.marketplaceOffer = marketplaceOffer;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PrivateAccess.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PrivateAccess.java
index add05acbac1c..aec627cde5be 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PrivateAccess.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PrivateAccess.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PrivateAccessInner;
 import java.util.List;
 
 /**
  * Type representing PrivateAccess.
  */
-public interface PrivateAccess extends HasInner<PrivateAccessInner>, HasManager<AppServiceManager> {
+public interface PrivateAccess extends HasInner<PrivateAccessInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the enabled value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessInfo.java
index d9c894a8e0c6..cb86702a6f1c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessInfo.java
@@ -13,7 +13,7 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import java.util.Map;
 import org.joda.time.DateTime;
@@ -21,7 +21,7 @@
 /**
  * Type representing ProcessInfo.
  */
-public interface ProcessInfo extends HasInner<ProcessInfoInner>, Indexable, Refreshable<ProcessInfo>, HasManager<AppServiceManager> {
+public interface ProcessInfo extends HasInner<ProcessInfoInner>, Indexable, Refreshable<ProcessInfo>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the children value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessModuleInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessModuleInfo.java
index fd9b214e639e..bd652d6d46bd 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessModuleInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessModuleInfo.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing ProcessModuleInfo.
  */
-public interface ProcessModuleInfo extends HasInner<ProcessModuleInfoInner>, Indexable, Refreshable<ProcessModuleInfo>, HasManager<AppServiceManager> {
+public interface ProcessModuleInfo extends HasInner<ProcessModuleInfoInner>, Indexable, Refreshable<ProcessModuleInfo>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the baseAddress value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessThreadInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessThreadInfo.java
index d3f2c7c2ae87..3e30c7bec4c2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessThreadInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ProcessThreadInfo.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing ProcessThreadInfo.
  */
-public interface ProcessThreadInfo extends HasInner<ProcessThreadInfoInner>, Indexable, Refreshable<ProcessThreadInfo>, HasManager<AppServiceManager> {
+public interface ProcessThreadInfo extends HasInner<ProcessThreadInfoInner>, Indexable, Refreshable<ProcessThreadInfo>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the basePriority value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PublicCertificate.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PublicCertificate.java
index 1b539f3544bf..b59914cb84c7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PublicCertificate.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PublicCertificate.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing PublicCertificate.
  */
-public interface PublicCertificate extends HasInner<PublicCertificateInner>, Indexable, Refreshable<PublicCertificate>, Updatable<PublicCertificate.Update>, HasManager<AppServiceManager> {
+public interface PublicCertificate extends HasInner<PublicCertificateInner>, Indexable, Refreshable<PublicCertificate>, Updatable<PublicCertificate.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the blob value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PushSettings.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PushSettings.java
index c24395b90ac3..28170ac8abdf 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PushSettings.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/PushSettings.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PushSettingsInner;
 
 /**
  * Type representing PushSettings.
  */
-public interface PushSettings extends HasInner<PushSettingsInner>, HasManager<AppServiceManager> {
+public interface PushSettings extends HasInner<PushSettingsInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the dynamicTagsJson value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Recommendation.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Recommendation.java
index a747281c4721..231dab0196ff 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Recommendation.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Recommendation.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RecommendationInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.UUID;
@@ -19,7 +19,7 @@
 /**
  * Type representing Recommendation.
  */
-public interface Recommendation extends HasInner<RecommendationInner>, HasManager<AppServiceManager> {
+public interface Recommendation extends HasInner<RecommendationInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the actionName value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RecommendationRule.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RecommendationRule.java
index 50fe55459865..55e551dfc08d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RecommendationRule.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RecommendationRule.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RecommendationRuleInner;
 import java.util.List;
 import java.util.UUID;
@@ -18,7 +18,7 @@
 /**
  * Type representing RecommendationRule.
  */
-public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<AppServiceManager> {
+public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the actionName value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RelayServiceConnectionEntity.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RelayServiceConnectionEntity.java
index 862eeba5f478..08225749727a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RelayServiceConnectionEntity.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RelayServiceConnectionEntity.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RelayServiceConnectionEntityInner;
 
 /**
  * Type representing RelayServiceConnectionEntity.
  */
-public interface RelayServiceConnectionEntity extends HasInner<RelayServiceConnectionEntityInner>, HasManager<AppServiceManager> {
+public interface RelayServiceConnectionEntity extends HasInner<RelayServiceConnectionEntityInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the biztalkUri value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Rendering.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Rendering.java
new file mode 100644
index 000000000000..d4ec7d15d2ba
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Rendering.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Instructions for rendering the data.
+ */
+public class Rendering {
+    /**
+     * Rendering Type. Possible values include: 'NoGraph', 'Table',
+     * 'TimeSeries', 'TimeSeriesPerInstance'.
+     */
+    @JsonProperty(value = "type")
+    private RenderingType type;
+
+    /**
+     * Title of data.
+     */
+    @JsonProperty(value = "title")
+    private String title;
+
+    /**
+     * Description of the data that will help it be interpreted.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Get rendering Type. Possible values include: 'NoGraph', 'Table', 'TimeSeries', 'TimeSeriesPerInstance'.
+     *
+     * @return the type value
+     */
+    public RenderingType type() {
+        return this.type;
+    }
+
+    /**
+     * Set rendering Type. Possible values include: 'NoGraph', 'Table', 'TimeSeries', 'TimeSeriesPerInstance'.
+     *
+     * @param type the type value to set
+     * @return the Rendering object itself.
+     */
+    public Rendering withType(RenderingType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get title of data.
+     *
+     * @return the title value
+     */
+    public String title() {
+        return this.title;
+    }
+
+    /**
+     * Set title of data.
+     *
+     * @param title the title value to set
+     * @return the Rendering object itself.
+     */
+    public Rendering withTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    /**
+     * Get description of the data that will help it be interpreted.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set description of the data that will help it be interpreted.
+     *
+     * @param description the description value to set
+     * @return the Rendering object itself.
+     */
+    public Rendering withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RenderingType.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RenderingType.java
new file mode 100644
index 000000000000..d52efbc0eafc
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RenderingType.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for RenderingType.
+ */
+public enum RenderingType {
+    /** Enum value NoGraph. */
+    NO_GRAPH("NoGraph"),
+
+    /** Enum value Table. */
+    TABLE("Table"),
+
+    /** Enum value TimeSeries. */
+    TIME_SERIES("TimeSeries"),
+
+    /** Enum value TimeSeriesPerInstance. */
+    TIME_SERIES_PER_INSTANCE("TimeSeriesPerInstance");
+
+    /** The actual serialized value for a RenderingType instance. */
+    private String value;
+
+    RenderingType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a RenderingType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed RenderingType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static RenderingType fromString(String value) {
+        RenderingType[] items = RenderingType.values();
+        for (RenderingType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadata.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadata.java
new file mode 100644
index 000000000000..e47126ad5b89
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadata.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceHealthMetadataInner;
+
+/**
+ * Type representing ResourceHealthMetadata.
+ */
+public interface ResourceHealthMetadata extends HasInner<ResourceHealthMetadataInner>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the category value.
+     */
+    String category();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the signalAvailability value.
+     */
+    Boolean signalAvailability();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadatas.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadatas.java
new file mode 100644
index 000000000000..378b957895bc
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ResourceHealthMetadatas.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import rx.Observable;
+
+/**
+ * Type representing ResourceHealthMetadatas.
+ */
+public interface ResourceHealthMetadatas {
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> listBySiteAsync(final String resourceGroupName, final String name);
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> getBySiteAsync(String resourceGroupName, String name);
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> listAsync();
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> listByResourceGroupAsync(final String resourceGroupName);
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> listBySiteSlotAsync(final String resourceGroupName, final String name, final String slot);
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ResourceHealthMetadata> getBySiteSlotAsync(String resourceGroupName, String name, String slot);
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RestoreRequest.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RestoreRequest.java
index 033364d8266d..bc397927de60 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RestoreRequest.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/RestoreRequest.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RestoreRequestInner;
 import java.util.List;
 
 /**
  * Type representing RestoreRequest.
  */
-public interface RestoreRequest extends HasInner<RestoreRequestInner>, HasManager<AppServiceManager> {
+public interface RestoreRequest extends HasInner<RestoreRequestInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the adjustConnectionStrings value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmCsmUsageQuota.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmCsmUsageQuota.java
index 7bf86efcc829..55c2b358dc78 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmCsmUsageQuota.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmCsmUsageQuota.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CsmUsageQuotaInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing ServerfarmCsmUsageQuota.
  */
-public interface ServerfarmCsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<AppServiceManager> {
+public interface ServerfarmCsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmHybridConnection.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmHybridConnection.java
index e5760052b8ca..0ed638bfd3cb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmHybridConnection.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmHybridConnection.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing ServerfarmHybridConnection.
  */
-public interface ServerfarmHybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<ServerfarmHybridConnection>, HasManager<AppServiceManager> {
+public interface ServerfarmHybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<ServerfarmHybridConnection>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the hostname value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetric.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetric.java
index 4e7a043ca70b..46c44b97a004 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetric.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing ServerfarmResourceMetric.
  */
-public interface ServerfarmResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface ServerfarmResourceMetric extends HasInner<ResourceMetricInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetricDefinition.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetricDefinition.java
index a380f9860558..2f982bfb4a8d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetricDefinition.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmResourceMetricDefinition.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceMetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Type representing ServerfarmResourceMetricDefinition.
  */
-public interface ServerfarmResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface ServerfarmResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmSite.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmSite.java
index d88e1392432a..c57bf6c22a5c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmSite.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmSite.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -19,7 +19,7 @@
 /**
  * Type representing ServerfarmSite.
  */
-public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<AppServiceManager> {
+public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the availabilityState value.
      */
@@ -90,6 +90,11 @@ public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<AppServi
      */
     Boolean httpsOnly();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the id value.
      */
@@ -180,11 +185,6 @@ public interface ServerfarmSite extends HasInner<SiteInner>, HasManager<AppServi
      */
     SlotSwapStatus slotSwapStatus();
 
-    /**
-     * @return the snapshotInfo value.
-     */
-    SnapshotRecoveryRequest snapshotInfo();
-
     /**
      * @return the state value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetGateway.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetGateway.java
index 83c4402e1eff..cf925c84abf6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetGateway.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetGateway.java
@@ -15,12 +15,12 @@
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing ServerfarmVnetGateway.
  */
-public interface ServerfarmVnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<ServerfarmVnetGateway>, Updatable<ServerfarmVnetGateway.Update>, HasManager<AppServiceManager> {
+public interface ServerfarmVnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<ServerfarmVnetGateway>, Updatable<ServerfarmVnetGateway.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetInfo.java
index 9b860fc0e759..675e1c498855 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServerfarmVnetInfo.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 
 /**
  * Type representing ServerfarmVnetInfo.
  */
-public interface ServerfarmVnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<ServerfarmVnetInfo>, HasManager<AppServiceManager> {
+public interface ServerfarmVnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<ServerfarmVnetInfo>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the certBlob value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServiceSpecification.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServiceSpecification.java
index 4497d3f861e2..56f1f84c1d4a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServiceSpecification.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ServiceSpecification.java
@@ -21,6 +21,12 @@ public class ServiceSpecification {
     @JsonProperty(value = "metricSpecifications")
     private List<MetricSpecification> metricSpecifications;
 
+    /**
+     * The logSpecifications property.
+     */
+    @JsonProperty(value = "logSpecifications")
+    private List<LogSpecification> logSpecifications;
+
     /**
      * Get the metricSpecifications value.
      *
@@ -41,4 +47,24 @@ public ServiceSpecification withMetricSpecifications(List<MetricSpecification> m
         return this;
     }
 
+    /**
+     * Get the logSpecifications value.
+     *
+     * @return the logSpecifications value
+     */
+    public List<LogSpecification> logSpecifications() {
+        return this.logSpecifications;
+    }
+
+    /**
+     * Set the logSpecifications value.
+     *
+     * @param logSpecifications the logSpecifications value to set
+     * @return the ServiceSpecification object itself.
+     */
+    public ServiceSpecification withLogSpecifications(List<LogSpecification> logSpecifications) {
+        this.logSpecifications = logSpecifications;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteAuthSettings.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteAuthSettings.java
index 2dc022bf7397..66d42e5456c2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteAuthSettings.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteAuthSettings.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteAuthSettingsInner;
 import java.util.List;
 
 /**
  * Type representing SiteAuthSettings.
  */
-public interface SiteAuthSettings extends HasInner<SiteAuthSettingsInner>, HasManager<AppServiceManager> {
+public interface SiteAuthSettings extends HasInner<SiteAuthSettingsInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the additionalLoginParams value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCloneability.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCloneability.java
index f3b3549c775a..11a026bf47a3 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCloneability.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCloneability.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteCloneabilityInner;
 import java.util.List;
 
 /**
  * Type representing SiteCloneability.
  */
-public interface SiteCloneability extends HasInner<SiteCloneabilityInner>, HasManager<AppServiceManager> {
+public interface SiteCloneability extends HasInner<SiteCloneabilityInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the blockingCharacteristics value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfig.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfig.java
index 31b877c49d29..c36b338ac147 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfig.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfig.java
@@ -10,6 +10,7 @@
 
 import java.util.List;
 import org.joda.time.DateTime;
+import java.util.Map;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PushSettingsInner;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -62,8 +63,8 @@ public class SiteConfig {
     /**
      * Xenon App Framework and version.
      */
-    @JsonProperty(value = "xenonFxVersion")
-    private String xenonFxVersion;
+    @JsonProperty(value = "windowsFxVersion")
+    private String windowsFxVersion;
 
     /**
      * &lt;code&gt;true&lt;/code&gt; if request tracing is enabled; otherwise,
@@ -123,6 +124,12 @@ public class SiteConfig {
     @JsonProperty(value = "appSettings")
     private List<NameValuePair> appSettings;
 
+    /**
+     * User-provided Azure storage accounts.
+     */
+    @JsonProperty(value = "azureStorageAccounts")
+    private Map<String, AzureStorageInfoValue> azureStorageAccounts;
+
     /**
      * Connection strings.
      */
@@ -327,6 +334,13 @@ public class SiteConfig {
     @JsonProperty(value = "ftpsState")
     private FtpsState ftpsState;
 
+    /**
+     * Number of reserved instances.
+     * This setting only applies to the Consumption Plan.
+     */
+    @JsonProperty(value = "reservedInstanceCount")
+    private Integer reservedInstanceCount;
+
     /**
      * Get number of workers.
      *
@@ -470,20 +484,20 @@ public SiteConfig withLinuxFxVersion(String linuxFxVersion) {
     /**
      * Get xenon App Framework and version.
      *
-     * @return the xenonFxVersion value
+     * @return the windowsFxVersion value
      */
-    public String xenonFxVersion() {
-        return this.xenonFxVersion;
+    public String windowsFxVersion() {
+        return this.windowsFxVersion;
     }
 
     /**
      * Set xenon App Framework and version.
      *
-     * @param xenonFxVersion the xenonFxVersion value to set
+     * @param windowsFxVersion the windowsFxVersion value to set
      * @return the SiteConfig object itself.
      */
-    public SiteConfig withXenonFxVersion(String xenonFxVersion) {
-        this.xenonFxVersion = xenonFxVersion;
+    public SiteConfig withWindowsFxVersion(String windowsFxVersion) {
+        this.windowsFxVersion = windowsFxVersion;
         return this;
     }
 
@@ -667,6 +681,26 @@ public SiteConfig withAppSettings(List<NameValuePair> appSettings) {
         return this;
     }
 
+    /**
+     * Get user-provided Azure storage accounts.
+     *
+     * @return the azureStorageAccounts value
+     */
+    public Map<String, AzureStorageInfoValue> azureStorageAccounts() {
+        return this.azureStorageAccounts;
+    }
+
+    /**
+     * Set user-provided Azure storage accounts.
+     *
+     * @param azureStorageAccounts the azureStorageAccounts value to set
+     * @return the SiteConfig object itself.
+     */
+    public SiteConfig withAzureStorageAccounts(Map<String, AzureStorageInfoValue> azureStorageAccounts) {
+        this.azureStorageAccounts = azureStorageAccounts;
+        return this;
+    }
+
     /**
      * Get connection strings.
      *
@@ -1296,4 +1330,26 @@ public SiteConfig withFtpsState(FtpsState ftpsState) {
         return this;
     }
 
+    /**
+     * Get number of reserved instances.
+     This setting only applies to the Consumption Plan.
+     *
+     * @return the reservedInstanceCount value
+     */
+    public Integer reservedInstanceCount() {
+        return this.reservedInstanceCount;
+    }
+
+    /**
+     * Set number of reserved instances.
+     This setting only applies to the Consumption Plan.
+     *
+     * @param reservedInstanceCount the reservedInstanceCount value to set
+     * @return the SiteConfig object itself.
+     */
+    public SiteConfig withReservedInstanceCount(Integer reservedInstanceCount) {
+        this.reservedInstanceCount = reservedInstanceCount;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigResource.java
index f46fef6dd329..aa5dd7d05142 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigResource.java
@@ -10,16 +10,17 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteConfigResourceInner;
 import java.util.List;
+import java.util.Map;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PushSettingsInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteConfigResource.
  */
-public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, HasManager<AppServiceManager> {
+public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the alwaysOn value.
      */
@@ -55,6 +56,11 @@ public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, H
      */
     String autoSwapSlotName();
 
+    /**
+     * @return the azureStorageAccounts value.
+     */
+    Map<String, AzureStorageInfoValue> azureStorageAccounts();
+
     /**
      * @return the connectionStrings value.
      */
@@ -240,6 +246,11 @@ public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, H
      */
     DateTime requestTracingExpirationTime();
 
+    /**
+     * @return the reservedInstanceCount value.
+     */
+    Integer reservedInstanceCount();
+
     /**
      * @return the scmType value.
      */
@@ -276,9 +287,9 @@ public interface SiteConfigResource extends HasInner<SiteConfigResourceInner>, H
     Boolean webSocketsEnabled();
 
     /**
-     * @return the xenonFxVersion value.
+     * @return the windowsFxVersion value.
      */
-    String xenonFxVersion();
+    String windowsFxVersion();
 
     /**
      * @return the xManagedServiceIdentityId value.
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigurationSnapshotInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigurationSnapshotInfo.java
index 0c45c47e1f66..5ef511819847 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigurationSnapshotInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteConfigurationSnapshotInfo.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteConfigurationSnapshotInfoInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteConfigurationSnapshotInfo.
  */
-public interface SiteConfigurationSnapshotInfo extends HasInner<SiteConfigurationSnapshotInfoInner>, HasManager<AppServiceManager> {
+public interface SiteConfigurationSnapshotInfo extends HasInner<SiteConfigurationSnapshotInfoInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCsmUsageQuota.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCsmUsageQuota.java
index b0cd68383270..61f2a99b8bc8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCsmUsageQuota.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteCsmUsageQuota.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CsmUsageQuotaInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteCsmUsageQuota.
  */
-public interface SiteCsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<AppServiceManager> {
+public interface SiteCsmUsageQuota extends HasInner<CsmUsageQuotaInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteExtensionInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteExtensionInfo.java
index e47448c06d9e..7bfc60f41dd3 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteExtensionInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteExtensionInfo.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 
 /**
  * Type representing SiteExtensionInfo.
  */
-public interface SiteExtensionInfo extends HasInner<SiteExtensionInfoInner>, Indexable, Refreshable<SiteExtensionInfo>, Updatable<SiteExtensionInfo.Update>, HasManager<AppServiceManager> {
+public interface SiteExtensionInfo extends HasInner<SiteExtensionInfoInner>, Indexable, Refreshable<SiteExtensionInfo>, Updatable<SiteExtensionInfo.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the authors value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteHybridConnection.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteHybridConnection.java
index 9417e4e82217..4f2fc349c441 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteHybridConnection.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteHybridConnection.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing SiteHybridConnection.
  */
-public interface SiteHybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<SiteHybridConnection>, Updatable<SiteHybridConnection.Update>, HasManager<AppServiceManager> {
+public interface SiteHybridConnection extends HasInner<HybridConnectionInner>, Indexable, Refreshable<SiteHybridConnection>, Updatable<SiteHybridConnection.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the hostname value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteInstance.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteInstance.java
index 8b5bf21e9348..5444bd17e5bc 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteInstance.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteInstance.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteInstanceInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing SiteInstance.
  */
-public interface SiteInstance extends HasInner<SiteInstanceInner>, HasManager<AppServiceManager> {
+public interface SiteInstance extends HasInner<SiteInstanceInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteLogsConfig.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteLogsConfig.java
index c200e6a13361..f13a7df18930 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteLogsConfig.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteLogsConfig.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteLogsConfigInner;
 
 /**
  * Type representing SiteLogsConfig.
  */
-public interface SiteLogsConfig extends HasInner<SiteLogsConfigInner>, HasManager<AppServiceManager> {
+public interface SiteLogsConfig extends HasInner<SiteLogsConfigInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the applicationLogs value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePatchResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePatchResource.java
index f6ee73a3d0f8..f6829a50e1d3 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePatchResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePatchResource.java
@@ -88,11 +88,17 @@ public class SitePatchResource extends ProxyOnlyResource {
     private Boolean reserved;
 
     /**
-     * Hyper-V sandbox.
+     * Obsolete: Hyper-V sandbox.
      */
     @JsonProperty(value = "properties.isXenon")
     private Boolean isXenon;
 
+    /**
+     * Hyper-V sandbox.
+     */
+    @JsonProperty(value = "properties.hyperV")
+    private Boolean hyperV;
+
     /**
      * Last time the app was modified, in UTC. Read-only.
      */
@@ -205,13 +211,6 @@ public class SitePatchResource extends ProxyOnlyResource {
     @JsonProperty(value = "properties.cloningInfo")
     private CloningInfo cloningInfo;
 
-    /**
-     * If specified during app creation, the app is created from a previous
-     * snapshot.
-     */
-    @JsonProperty(value = "properties.snapshotInfo")
-    private SnapshotRecoveryRequest snapshotInfo;
-
     /**
      * Name of the resource group the app belongs to. Read-only.
      */
@@ -381,7 +380,7 @@ public SitePatchResource withReserved(Boolean reserved) {
     }
 
     /**
-     * Get hyper-V sandbox.
+     * Get obsolete: Hyper-V sandbox.
      *
      * @return the isXenon value
      */
@@ -390,7 +389,7 @@ public Boolean isXenon() {
     }
 
     /**
-     * Set hyper-V sandbox.
+     * Set obsolete: Hyper-V sandbox.
      *
      * @param isXenon the isXenon value to set
      * @return the SitePatchResource object itself.
@@ -400,6 +399,26 @@ public SitePatchResource withIsXenon(Boolean isXenon) {
         return this;
     }
 
+    /**
+     * Get hyper-V sandbox.
+     *
+     * @return the hyperV value
+     */
+    public Boolean hyperV() {
+        return this.hyperV;
+    }
+
+    /**
+     * Set hyper-V sandbox.
+     *
+     * @param hyperV the hyperV value to set
+     * @return the SitePatchResource object itself.
+     */
+    public SitePatchResource withHyperV(Boolean hyperV) {
+        this.hyperV = hyperV;
+        return this;
+    }
+
     /**
      * Get last time the app was modified, in UTC. Read-only.
      *
@@ -646,26 +665,6 @@ public SitePatchResource withCloningInfo(CloningInfo cloningInfo) {
         return this;
     }
 
-    /**
-     * Get if specified during app creation, the app is created from a previous snapshot.
-     *
-     * @return the snapshotInfo value
-     */
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.snapshotInfo;
-    }
-
-    /**
-     * Set if specified during app creation, the app is created from a previous snapshot.
-     *
-     * @param snapshotInfo the snapshotInfo value to set
-     * @return the SitePatchResource object itself.
-     */
-    public SitePatchResource withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo) {
-        this.snapshotInfo = snapshotInfo;
-        return this;
-    }
-
     /**
      * Get name of the resource group the app belongs to. Read-only.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePhpErrorLogFlag.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePhpErrorLogFlag.java
index 3090af424e35..87238fa3457e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePhpErrorLogFlag.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SitePhpErrorLogFlag.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SitePhpErrorLogFlagInner;
 
 /**
  * Type representing SitePhpErrorLogFlag.
  */
-public interface SitePhpErrorLogFlag extends HasInner<SitePhpErrorLogFlagInner>, HasManager<AppServiceManager> {
+public interface SitePhpErrorLogFlag extends HasInner<SitePhpErrorLogFlagInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetric.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetric.java
index 8a62b8b75caa..2ce96730dccb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetric.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceMetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing SiteResourceMetric.
  */
-public interface SiteResourceMetric extends HasInner<ResourceMetricInner>, HasManager<AppServiceManager> {
+public interface SiteResourceMetric extends HasInner<ResourceMetricInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the endTime value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetricDefinition.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetricDefinition.java
index 173e84239d86..4af5649afb81 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetricDefinition.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteResourceMetricDefinition.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ResourceMetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import java.util.Map;
 
 /**
  * Type representing SiteResourceMetricDefinition.
  */
-public interface SiteResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<AppServiceManager> {
+public interface SiteResourceMetricDefinition extends HasInner<ResourceMetricDefinitionInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSeal.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSeal.java
index 01f3fa42cb91..b77e9482c873 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSeal.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSeal.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteSealInner;
 
 /**
  * Type representing SiteSeal.
  */
-public interface SiteSeal extends HasInner<SiteSealInner>, HasManager<AppServiceManager> {
+public interface SiteSeal extends HasInner<SiteSealInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the html value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSourceControl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSourceControl.java
index cea94bd0857b..daf20842ffe9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSourceControl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteSourceControl.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteSourceControlInner;
 
 /**
  * Type representing SiteSourceControl.
  */
-public interface SiteSourceControl extends HasInner<SiteSourceControlInner>, HasManager<AppServiceManager> {
+public interface SiteSourceControl extends HasInner<SiteSourceControlInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the branch value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetGateway.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetGateway.java
index 0b5a57999e61..1bfe893948cf 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetGateway.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetGateway.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing SiteVnetGateway.
  */
-public interface SiteVnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<SiteVnetGateway>, Updatable<SiteVnetGateway.Update>, HasManager<AppServiceManager> {
+public interface SiteVnetGateway extends HasInner<VnetGatewayInner>, Indexable, Refreshable<SiteVnetGateway>, Updatable<SiteVnetGateway.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetInfo.java
index 816dd4d2e363..9269d719e18c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SiteVnetInfo.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 
 /**
  * Type representing SiteVnetInfo.
  */
-public interface SiteVnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<SiteVnetInfo>, Updatable<SiteVnetInfo.Update>, HasManager<AppServiceManager> {
+public interface SiteVnetInfo extends HasInner<VnetInfoInner>, Indexable, Refreshable<SiteVnetInfo>, Updatable<SiteVnetInfo.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the certBlob value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Sites.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Sites.java
index 138619b620a2..c40965014c65 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Sites.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Sites.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Sites.
  */
-public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceCore<AppServiceManager, SiteInner>, HasResourceGroup, Refreshable<Sites>, Updatable<Sites.Update>, HasManager<AppServiceManager> {
+public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceCore<CertificateRegistrationManager, SiteInner>, HasResourceGroup, Refreshable<Sites>, Updatable<Sites.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the availabilityState value.
      */
@@ -96,6 +96,11 @@ public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceC
      */
     Boolean httpsOnly();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the identity value.
      */
@@ -171,11 +176,6 @@ public interface Sites extends HasInner<SiteInner>, Resource, GroupableResourceC
      */
     SlotSwapStatus slotSwapStatus();
 
-    /**
-     * @return the snapshotInfo value.
-     */
-    SnapshotRecoveryRequest snapshotInfo();
-
     /**
      * @return the state value.
      */
@@ -323,6 +323,16 @@ interface WithHttpsOnly {
             WithCreate withHttpsOnly(Boolean httpsOnly);
         }
 
+        /**
+         * The stage of the sites update allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            WithCreate withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the sites update allowing to specify Identity.
          */
@@ -393,28 +403,18 @@ interface WithSiteConfig {
             WithCreate withSiteConfig(SiteConfig siteConfig);
         }
 
-        /**
-         * The stage of the sites update allowing to specify SnapshotInfo.
-         */
-        interface WithSnapshotInfo {
-            /**
-             * Specifies snapshotInfo.
-             */
-            WithCreate withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo);
-        }
-
         /**
          * 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<Sites>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithClientAffinityEnabled, DefinitionStages.WithClientCertEnabled, DefinitionStages.WithCloningInfo, DefinitionStages.WithContainerSize, DefinitionStages.WithDailyMemoryTimeQuota, DefinitionStages.WithEnabled, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithHostNamesDisabled, DefinitionStages.WithHostNameSslStates, DefinitionStages.WithHttpsOnly, DefinitionStages.WithIdentity, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithReserved, DefinitionStages.WithScmSiteAlsoStopped, DefinitionStages.WithServerFarmId, DefinitionStages.WithSiteConfig, DefinitionStages.WithSnapshotInfo {
+        interface WithCreate extends Creatable<Sites>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithClientAffinityEnabled, DefinitionStages.WithClientCertEnabled, DefinitionStages.WithCloningInfo, DefinitionStages.WithContainerSize, DefinitionStages.WithDailyMemoryTimeQuota, DefinitionStages.WithEnabled, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithHostNamesDisabled, DefinitionStages.WithHostNameSslStates, DefinitionStages.WithHttpsOnly, DefinitionStages.WithHyperV, DefinitionStages.WithIdentity, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithReserved, DefinitionStages.WithScmSiteAlsoStopped, DefinitionStages.WithServerFarmId, DefinitionStages.WithSiteConfig {
         }
     }
     /**
      * The template for a Sites update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Sites>, Resource.UpdateWithTags<Update>, UpdateStages.WithClientAffinityEnabled, UpdateStages.WithClientCertEnabled, UpdateStages.WithCloningInfo, UpdateStages.WithContainerSize, UpdateStages.WithDailyMemoryTimeQuota, UpdateStages.WithEnabled, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithHostNamesDisabled, UpdateStages.WithHostNameSslStates, UpdateStages.WithHttpsOnly, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithReserved, UpdateStages.WithScmSiteAlsoStopped, UpdateStages.WithServerFarmId, UpdateStages.WithSiteConfig, UpdateStages.WithSnapshotInfo {
+    interface Update extends Appliable<Sites>, Resource.UpdateWithTags<Update>, UpdateStages.WithClientAffinityEnabled, UpdateStages.WithClientCertEnabled, UpdateStages.WithCloningInfo, UpdateStages.WithContainerSize, UpdateStages.WithDailyMemoryTimeQuota, UpdateStages.WithEnabled, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithHostNamesDisabled, UpdateStages.WithHostNameSslStates, UpdateStages.WithHttpsOnly, UpdateStages.WithHyperV, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithReserved, UpdateStages.WithScmSiteAlsoStopped, UpdateStages.WithServerFarmId, UpdateStages.WithSiteConfig {
     }
 
     /**
@@ -521,6 +521,16 @@ interface WithHttpsOnly {
             Update withHttpsOnly(Boolean httpsOnly);
         }
 
+        /**
+         * The stage of the sites {0} allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            Update withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the sites {0} allowing to specify IsXenon.
          */
@@ -581,15 +591,5 @@ interface WithSiteConfig {
             Update withSiteConfig(SiteConfig siteConfig);
         }
 
-        /**
-         * The stage of the sites {0} allowing to specify SnapshotInfo.
-         */
-        interface WithSnapshotInfo {
-            /**
-             * Specifies snapshotInfo.
-             */
-            Update withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo);
-        }
-
     }
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SkuInfo.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SkuInfo.java
index 67a4a28fd744..00002cc29081 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SkuInfo.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SkuInfo.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SkuInfoInner;
 
 /**
  * Type representing SkuInfo.
  */
-public interface SkuInfo extends HasInner<SkuInfoInner>, HasManager<AppServiceManager> {
+public interface SkuInfo extends HasInner<SkuInfoInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the capacity value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotConfigNamesResource.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotConfigNamesResource.java
index 313c2c9aeeff..40c8aa5a96d1 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotConfigNamesResource.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotConfigNamesResource.java
@@ -10,19 +10,24 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SlotConfigNamesResourceInner;
 import java.util.List;
 
 /**
  * Type representing SlotConfigNamesResource.
  */
-public interface SlotConfigNamesResource extends HasInner<SlotConfigNamesResourceInner>, HasManager<AppServiceManager> {
+public interface SlotConfigNamesResource extends HasInner<SlotConfigNamesResourceInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the appSettingNames value.
      */
     List<String> appSettingNames();
 
+    /**
+     * @return the azureStorageConfigNames value.
+     */
+    List<String> azureStorageConfigNames();
+
     /**
      * @return the connectionStringNames value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotDifference.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotDifference.java
index d6c1ced13035..b85ce5580df2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotDifference.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SlotDifference.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SlotDifferenceInner;
 
 /**
  * Type representing SlotDifference.
  */
-public interface SlotDifference extends HasInner<SlotDifferenceInner>, HasManager<AppServiceManager> {
+public interface SlotDifference extends HasInner<SlotDifferenceInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the description value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Slots.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Slots.java
index 767bf4b6cd0f..a064a1683478 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Slots.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Slots.java
@@ -16,7 +16,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import java.util.Map;
@@ -24,7 +24,7 @@
 /**
  * Type representing Slots.
  */
-public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots>, Updatable<Slots.Update>, HasManager<AppServiceManager> {
+public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots>, Updatable<Slots.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the availabilityState value.
      */
@@ -95,6 +95,11 @@ public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots
      */
     Boolean httpsOnly();
 
+    /**
+     * @return the hyperV value.
+     */
+    Boolean hyperV();
+
     /**
      * @return the id value.
      */
@@ -185,11 +190,6 @@ public interface Slots extends HasInner<SiteInner>, Indexable, Refreshable<Slots
      */
     SlotSwapStatus slotSwapStatus();
 
-    /**
-     * @return the snapshotInfo value.
-     */
-    SnapshotRecoveryRequest snapshotInfo();
-
     /**
      * @return the state value.
      */
@@ -361,6 +361,16 @@ interface WithHttpsOnly {
             WithCreate withHttpsOnly(Boolean httpsOnly);
         }
 
+        /**
+         * The stage of the slots definition allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            WithCreate withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the slots definition allowing to specify Identity.
          */
@@ -431,16 +441,6 @@ interface WithSiteConfig {
             WithCreate withSiteConfig(SiteConfig siteConfig);
         }
 
-        /**
-         * The stage of the slots definition allowing to specify SnapshotInfo.
-         */
-        interface WithSnapshotInfo {
-            /**
-             * Specifies snapshotInfo.
-             */
-            WithCreate withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo);
-        }
-
         /**
          * The stage of the slots definition allowing to specify Tags.
          */
@@ -456,13 +456,13 @@ interface WithTags {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Slots>, DefinitionStages.WithClientAffinityEnabled, DefinitionStages.WithClientCertEnabled, DefinitionStages.WithCloningInfo, DefinitionStages.WithContainerSize, DefinitionStages.WithDailyMemoryTimeQuota, DefinitionStages.WithEnabled, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithHostNamesDisabled, DefinitionStages.WithHostNameSslStates, DefinitionStages.WithHttpsOnly, DefinitionStages.WithIdentity, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithReserved, DefinitionStages.WithScmSiteAlsoStopped, DefinitionStages.WithServerFarmId, DefinitionStages.WithSiteConfig, DefinitionStages.WithSnapshotInfo, DefinitionStages.WithTags {
+        interface WithCreate extends Creatable<Slots>, DefinitionStages.WithClientAffinityEnabled, DefinitionStages.WithClientCertEnabled, DefinitionStages.WithCloningInfo, DefinitionStages.WithContainerSize, DefinitionStages.WithDailyMemoryTimeQuota, DefinitionStages.WithEnabled, DefinitionStages.WithHostingEnvironmentProfile, DefinitionStages.WithHostNamesDisabled, DefinitionStages.WithHostNameSslStates, DefinitionStages.WithHttpsOnly, DefinitionStages.WithHyperV, DefinitionStages.WithIdentity, DefinitionStages.WithIsXenon, DefinitionStages.WithKind, DefinitionStages.WithReserved, DefinitionStages.WithScmSiteAlsoStopped, DefinitionStages.WithServerFarmId, DefinitionStages.WithSiteConfig, DefinitionStages.WithTags {
         }
     }
     /**
      * The template for a Slots update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Slots>, UpdateStages.WithClientAffinityEnabled, UpdateStages.WithClientCertEnabled, UpdateStages.WithCloningInfo, UpdateStages.WithContainerSize, UpdateStages.WithDailyMemoryTimeQuota, UpdateStages.WithEnabled, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithHostNamesDisabled, UpdateStages.WithHostNameSslStates, UpdateStages.WithHttpsOnly, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithReserved, UpdateStages.WithScmSiteAlsoStopped, UpdateStages.WithServerFarmId, UpdateStages.WithSiteConfig, UpdateStages.WithSnapshotInfo {
+    interface Update extends Appliable<Slots>, UpdateStages.WithClientAffinityEnabled, UpdateStages.WithClientCertEnabled, UpdateStages.WithCloningInfo, UpdateStages.WithContainerSize, UpdateStages.WithDailyMemoryTimeQuota, UpdateStages.WithEnabled, UpdateStages.WithHostingEnvironmentProfile, UpdateStages.WithHostNamesDisabled, UpdateStages.WithHostNameSslStates, UpdateStages.WithHttpsOnly, UpdateStages.WithHyperV, UpdateStages.WithIsXenon, UpdateStages.WithKind, UpdateStages.WithReserved, UpdateStages.WithScmSiteAlsoStopped, UpdateStages.WithServerFarmId, UpdateStages.WithSiteConfig {
     }
 
     /**
@@ -569,6 +569,16 @@ interface WithHttpsOnly {
             Update withHttpsOnly(Boolean httpsOnly);
         }
 
+        /**
+         * The stage of the slots update allowing to specify HyperV.
+         */
+        interface WithHyperV {
+            /**
+             * Specifies hyperV.
+             */
+            Update withHyperV(Boolean hyperV);
+        }
+
         /**
          * The stage of the slots update allowing to specify IsXenon.
          */
@@ -629,15 +639,5 @@ interface WithSiteConfig {
             Update withSiteConfig(SiteConfig siteConfig);
         }
 
-        /**
-         * The stage of the slots update allowing to specify SnapshotInfo.
-         */
-        interface WithSnapshotInfo {
-            /**
-             * Specifies snapshotInfo.
-             */
-            Update withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo);
-        }
-
     }
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Snapshot.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Snapshot.java
index f52be147fe39..9617af34762d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Snapshot.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Snapshot.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SnapshotInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing Snapshot.
  */
-public interface Snapshot extends HasInner<SnapshotInner>, HasManager<AppServiceManager> {
+public interface Snapshot extends HasInner<SnapshotInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StampCapacity.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StampCapacity.java
index 21cc264d0d2a..6a80bf25f0d6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StampCapacity.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StampCapacity.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.StampCapacityInner;
 
 /**
  * Type representing StampCapacity.
  */
-public interface StampCapacity extends HasInner<StampCapacityInner>, HasManager<AppServiceManager> {
+public interface StampCapacity extends HasInner<StampCapacityInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the availableCapacity value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StorageMigrationResponse.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StorageMigrationResponse.java
index 27c1b6f8f854..544f42a90f4a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StorageMigrationResponse.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StorageMigrationResponse.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.StorageMigrationResponseInner;
 
 /**
  * Type representing StorageMigrationResponse.
  */
-public interface StorageMigrationResponse extends HasInner<StorageMigrationResponseInner>, HasManager<AppServiceManager> {
+public interface StorageMigrationResponse extends HasInner<StorageMigrationResponseInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StringDictionary.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StringDictionary.java
index a3176ecedea4..100a58514937 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StringDictionary.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/StringDictionary.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.StringDictionaryInner;
 import java.util.Map;
 
 /**
  * Type representing StringDictionary.
  */
-public interface StringDictionary extends HasInner<StringDictionaryInner>, HasManager<AppServiceManager> {
+public interface StringDictionary extends HasInner<StringDictionaryInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SwiftVirtualNetwork.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SwiftVirtualNetwork.java
new file mode 100644
index 000000000000..3ac349ae2197
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/SwiftVirtualNetwork.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SwiftVirtualNetworkInner;
+
+/**
+ * Type representing SwiftVirtualNetwork.
+ */
+public interface SwiftVirtualNetwork extends HasInner<SwiftVirtualNetworkInner>, HasManager<CertificateRegistrationManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the subnetResourceId value.
+     */
+    String subnetResourceId();
+
+    /**
+     * @return the swiftSupported value.
+     */
+    Boolean swiftSupported();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TldLegalAgreement.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TldLegalAgreement.java
index c1d8fdf05ae0..58e5f2b1987b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TldLegalAgreement.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TldLegalAgreement.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.TldLegalAgreementInner;
 
 /**
  * Type representing TldLegalAgreement.
  */
-public interface TldLegalAgreement extends HasInner<TldLegalAgreementInner>, HasManager<AppServiceManager> {
+public interface TldLegalAgreement extends HasInner<TldLegalAgreementInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the agreementKey value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TopLevelDomain.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TopLevelDomain.java
index 2a40691b69f4..cf383a3d99b3 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TopLevelDomain.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TopLevelDomain.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing TopLevelDomain.
  */
-public interface TopLevelDomain extends HasInner<TopLevelDomainInner>, Indexable, Refreshable<TopLevelDomain>, HasManager<AppServiceManager> {
+public interface TopLevelDomain extends HasInner<TopLevelDomainInner>, Indexable, Refreshable<TopLevelDomain>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredJobHistory.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredJobHistory.java
index 605790afabe6..2f7dfb6daf53 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredJobHistory.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredJobHistory.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.TriggeredJobHistoryInner;
 import java.util.List;
 
 /**
  * Type representing TriggeredJobHistory.
  */
-public interface TriggeredJobHistory extends HasInner<TriggeredJobHistoryInner>, HasManager<AppServiceManager> {
+public interface TriggeredJobHistory extends HasInner<TriggeredJobHistoryInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredWebJob.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredWebJob.java
index 1c82d8e74eac..7bc42565d2fb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredWebJob.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/TriggeredWebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing TriggeredWebJob.
  */
-public interface TriggeredWebJob extends HasInner<TriggeredWebJobInner>, Indexable, Refreshable<TriggeredWebJob>, HasManager<AppServiceManager> {
+public interface TriggeredWebJob extends HasInner<TriggeredWebJobInner>, Indexable, Refreshable<TriggeredWebJob>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the error value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Usage.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Usage.java
index aca653d01080..f3954f241fe9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Usage.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/Usage.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.UsageInner;
 import org.joda.time.DateTime;
 
 /**
  * Type representing Usage.
  */
-public interface Usage extends HasInner<UsageInner>, HasManager<AppServiceManager> {
+public interface Usage extends HasInner<UsageInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/User.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/User.java
index 852abf7942d3..82110a83bdeb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/User.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/User.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.UserInner;
 
 /**
  * Type representing User.
  */
-public interface User extends HasInner<UserInner>, HasManager<AppServiceManager> {
+public interface User extends HasInner<UserInner>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the id value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ValidateRequest.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ValidateRequest.java
index 518a02f5abb6..723652a3d303 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ValidateRequest.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/ValidateRequest.java
@@ -74,6 +74,13 @@ public class ValidateRequest {
     @JsonProperty(value = "properties.hostingEnvironment")
     private String hostingEnvironment;
 
+    /**
+     * &lt;code&gt;true&lt;/code&gt; if App Service plan is running as a
+     * windows container.
+     */
+    @JsonProperty(value = "properties.isXenon")
+    private Boolean isXenon;
+
     /**
      * Get resource name to verify.
      *
@@ -254,4 +261,24 @@ public ValidateRequest withHostingEnvironment(String hostingEnvironment) {
         return this;
     }
 
+    /**
+     * Get &lt;code&gt;true&lt;/code&gt; if App Service plan is running as a windows container.
+     *
+     * @return the isXenon value
+     */
+    public Boolean isXenon() {
+        return this.isXenon;
+    }
+
+    /**
+     * Set &lt;code&gt;true&lt;/code&gt; if App Service plan is running as a windows container.
+     *
+     * @param isXenon the isXenon value to set
+     * @return the ValidateRequest object itself.
+     */
+    public ValidateRequest withIsXenon(Boolean isXenon) {
+        this.isXenon = isXenon;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/VnetRoute.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/VnetRoute.java
index 4c58e2744510..cf746dcb849e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/VnetRoute.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/VnetRoute.java
@@ -15,12 +15,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 
 /**
  * Type representing VnetRoute.
  */
-public interface VnetRoute extends HasInner<VnetRouteInner>, Indexable, Updatable<VnetRoute.Update>, HasManager<AppServiceManager> {
+public interface VnetRoute extends HasInner<VnetRouteInner>, Indexable, Updatable<VnetRoute.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the endAddress value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebApps.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebApps.java
index e72aafc16f82..4b06826b1ef4 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebApps.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebApps.java
@@ -13,11 +13,13 @@
 import rx.Completable;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.BackupRequestInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.StringDictionaryInner;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SwiftVirtualNetworkInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteConfigResourceInner;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RelayServiceConnectionEntityInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RestoreRequestInner;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.RelayServiceConnectionEntityInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.BackupItem;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteAuthSettingsInner;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AzureStoragePropertyDictionaryResourceInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.ConnectionStringDictionaryInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.SiteLogsConfigInner;
 import com.microsoft.azure.management.appservice.v2018_02_01.implementation.PushSettingsInner;
@@ -286,6 +288,56 @@ public interface WebApps {
      */
     Observable<StringDictionary> listMetadataAsync(String resourceGroupName, String name);
 
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> getSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name);
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> createOrUpdateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope);
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteSwiftVirtualNetworkAsync(String resourceGroupName, String name);
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> updateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope);
+
     /**
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
@@ -332,6 +384,18 @@ public interface WebApps {
      */
     Completable getWebSiteContainerLogsAsync(String resourceGroupName, String name);
 
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestoreRequest> discoverBackupAsync(String resourceGroupName, String name, RestoreRequestInner request);
+
     /**
      * Fetch a short lived token that can be exchanged for a master key.
      * Fetch a short lived token that can be exchanged for a master key.
@@ -451,6 +515,29 @@ public interface WebApps {
      */
     Observable<Operation> migrateMySqlAsync(String resourceGroupName, String name, MigrateMySqlRequest migrationRequestEnvelope);
 
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable getNetworkTraceOperationAsync(String resourceGroupName, String name, String operationId);
+
+    /**
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable startWebSiteNetworkTraceAsync(String resourceGroupName, String name);
+
     /**
      * Start capturing network packets for the site.
      * Start capturing network packets for the site.
@@ -460,7 +547,7 @@ public interface WebApps {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable startWebSiteNetworkTraceAsync(String resourceGroupName, String name);
+    Completable startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name);
 
     /**
      * Stop ongoing capturing network packets for the site.
@@ -473,6 +560,18 @@ public interface WebApps {
      */
     Completable stopWebSiteNetworkTraceAsync(String resourceGroupName, String name);
 
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkTrace> getNetworkTracesAsync(String resourceGroupName, String name, String operationId);
+
     /**
      * Generates a new publishing password for an app (or deployment slot, if specified).
      * Generates a new publishing password for an app (or deployment slot, if specified).
@@ -513,10 +612,11 @@ public interface WebApps {
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name);
+    Completable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions);
 
     /**
      * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST.
@@ -679,18 +779,6 @@ public interface WebApps {
      */
     Completable deleteBackupAsync(String resourceGroupName, String name, String backupId);
 
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Observable<RestoreRequest> discoverRestoreAsync(String resourceGroupName, String name, RestoreRequestInner request);
-
     /**
      * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body.
      * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body.
@@ -729,19 +817,6 @@ public interface WebApps {
      */
     Observable<BackupItem> listBackupsSlotAsync(final String resourceGroupName, final String name, final String slot);
 
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Observable<RestoreRequest> discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request);
-
     /**
      * Gets a backup of an app by its ID.
      * Gets a backup of an app by its ID.
@@ -892,6 +967,54 @@ public interface WebApps {
      */
     Observable<SiteAuthSettings> getAuthSettingsSlotAsync(String resourceGroupName, String name, String slot);
 
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AzureStoragePropertyDictionaryResource> updateAzureStorageAccountsAsync(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts);
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AzureStoragePropertyDictionaryResource> listAzureStorageAccountsAsync(String resourceGroupName, String name);
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AzureStoragePropertyDictionaryResource> updateAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts);
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AzureStoragePropertyDictionaryResource> listAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot);
+
     /**
      * Replaces the connection strings of an app.
      * Replaces the connection strings of an app.
@@ -2640,6 +2763,20 @@ public interface WebApps {
      */
     Completable deletePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot);
 
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PremierAddOn> updatePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn);
+
     /**
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
@@ -3008,6 +3145,60 @@ public interface WebApps {
      */
     Observable<StringDictionary> listMetadataSlotAsync(String resourceGroupName, String name, String slot);
 
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> getSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot);
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> createOrUpdateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope);
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteSwiftVirtualNetworkSlotAsync(String resourceGroupName, String name, String slot);
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+    in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<SwiftVirtualNetwork> updateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope);
+
     /**
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
@@ -3058,6 +3249,19 @@ public interface WebApps {
      */
     Completable getWebSiteContainerLogsSlotAsync(String resourceGroupName, String name, String slot);
 
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<RestoreRequest> discoverBackupSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request);
+
     /**
      * Fetch a short lived token that can be exchanged for a master key.
      * Fetch a short lived token that can be exchanged for a master key.
@@ -3160,6 +3364,31 @@ public interface WebApps {
      */
     Observable<FunctionSecrets> listSyncFunctionTriggersSlotAsync(String resourceGroupName, String name, String slot);
 
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable getNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot);
+
+    /**
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable startWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot);
+
     /**
      * Start capturing network packets for the site.
      * Start capturing network packets for the site.
@@ -3170,7 +3399,7 @@ public interface WebApps {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable startWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot);
+    Completable startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot);
 
     /**
      * Stop ongoing capturing network packets for the site.
@@ -3184,6 +3413,19 @@ public interface WebApps {
      */
     Completable stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot);
 
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkTrace> getNetworkTracesSlotAsync(String resourceGroupName, String name, String operationId, String slot);
+
     /**
      * Generates a new publishing password for an app (or deployment slot, if specified).
      * Generates a new publishing password for an app (or deployment slot, if specified).
@@ -3228,10 +3470,11 @@ public interface WebApps {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot);
+    Completable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions);
 
     /**
      * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST.
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebJob.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebJob.java
index d0c0d948b708..df38044543db 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebJob.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WebJob.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.Map;
 
 /**
  * Type representing WebJob.
  */
-public interface WebJob extends HasInner<WebJobInner>, Indexable, Refreshable<WebJob>, HasManager<AppServiceManager> {
+public interface WebJob extends HasInner<WebJobInner>, Indexable, Refreshable<WebJob>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the error value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WorkerPools.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WorkerPools.java
index 229b904ecb93..bae6d738a645 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WorkerPools.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/WorkerPools.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2018_02_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2018_02_01.implementation.CertificateRegistrationManager;
 import java.util.List;
 
 /**
  * Type representing WorkerPools.
  */
-public interface WorkerPools extends HasInner<WorkerPoolResourceInner>, Indexable, Refreshable<WorkerPools>, Updatable<WorkerPools.Update>, HasManager<AppServiceManager> {
+public interface WorkerPools extends HasInner<WorkerPoolResourceInner>, Indexable, Refreshable<WorkerPools>, Updatable<WorkerPools.Update>, HasManager<CertificateRegistrationManager> {
     /**
      * @return the computeMode value.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AddressResponseImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AddressResponseImpl.java
index 7123c7cbccd0..f02cd61c3081 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AddressResponseImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AddressResponseImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.VirtualIPMapping;
 
 class AddressResponseImpl extends WrapperImpl<AddressResponseInner> implements AddressResponse {
-    private final AppServiceManager manager;
-    AddressResponseImpl(AddressResponseInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    AddressResponseImpl(AddressResponseInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AnalysisDefinitionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AnalysisDefinitionImpl.java
index 1684e4259edf..eed72cb2c026 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AnalysisDefinitionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AnalysisDefinitionImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class AnalysisDefinitionImpl extends WrapperImpl<AnalysisDefinitionInner> implements AnalysisDefinition {
-    private final AppServiceManager manager;
-    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrderImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrderImpl.java
index 1fa7bb5ada84..737f428f2744 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrderImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrderImpl.java
@@ -22,9 +22,9 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CertificateDetails;
 import rx.functions.Func1;
 
-class AppServiceCertificateOrderImpl extends GroupableResourceCoreImpl<AppServiceCertificateOrder, AppServiceCertificateOrderInner, AppServiceCertificateOrderImpl, AppServiceManager> implements AppServiceCertificateOrder, AppServiceCertificateOrder.Definition, AppServiceCertificateOrder.Update {
+class AppServiceCertificateOrderImpl extends GroupableResourceCoreImpl<AppServiceCertificateOrder, AppServiceCertificateOrderInner, AppServiceCertificateOrderImpl, CertificateRegistrationManager> implements AppServiceCertificateOrder, AppServiceCertificateOrder.Definition, AppServiceCertificateOrder.Update {
     private AppServiceCertificateOrderPatchResource updateParameter;
-    AppServiceCertificateOrderImpl(String name, AppServiceCertificateOrderInner inner, AppServiceManager manager) {
+    AppServiceCertificateOrderImpl(String name, AppServiceCertificateOrderInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new AppServiceCertificateOrderPatchResource();
     }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrdersImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrdersImpl.java
index 9b50f6e0c9a9..563e88ecc583 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrdersImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateOrdersImpl.java
@@ -26,14 +26,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.AppServiceCertificateResource;
 
 class AppServiceCertificateOrdersImpl extends WrapperImpl<AppServiceCertificateOrdersInner> implements AppServiceCertificateOrders {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    AppServiceCertificateOrdersImpl(AppServiceManager manager) {
+    AppServiceCertificateOrdersImpl(CertificateRegistrationManager manager) {
         super(manager.inner().appServiceCertificateOrders());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateResourceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateResourceImpl.java
index aa10674091fd..5727afb3aa2d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateResourceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceCertificateResourceImpl.java
@@ -17,13 +17,13 @@
 import rx.functions.Func1;
 
 class AppServiceCertificateResourceImpl extends CreatableUpdatableImpl<AppServiceCertificateResource, AppServiceCertificateResourceInner, AppServiceCertificateResourceImpl> implements AppServiceCertificateResource, AppServiceCertificateResource.Definition, AppServiceCertificateResource.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String certificateOrderName;
     private String name;
     private AppServiceCertificatePatchResource updateParameter;
 
-    AppServiceCertificateResourceImpl(String name, AppServiceManager manager) {
+    AppServiceCertificateResourceImpl(String name, CertificateRegistrationManager manager) {
         super(name, new AppServiceCertificateResourceInner());
         this.manager = manager;
         // Set resource name
@@ -32,7 +32,7 @@ class AppServiceCertificateResourceImpl extends CreatableUpdatableImpl<AppServic
         this.updateParameter = new AppServiceCertificatePatchResource();
     }
 
-    AppServiceCertificateResourceImpl(AppServiceCertificateResourceInner inner, AppServiceManager manager) {
+    AppServiceCertificateResourceImpl(AppServiceCertificateResourceInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -46,7 +46,7 @@ class AppServiceCertificateResourceImpl extends CreatableUpdatableImpl<AppServic
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentInner.java
index 3e9a26fdae1a..13dc87bf5da1 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentInner.java
@@ -264,6 +264,19 @@ public class AppServiceEnvironmentInner {
     @JsonProperty(value = "hasLinuxWorkers")
     private Boolean hasLinuxWorkers;
 
+    /**
+     * Key Vault ID for ILB App Service Environment default SSL certificate.
+     */
+    @JsonProperty(value = "sslCertKeyVaultId")
+    private String sslCertKeyVaultId;
+
+    /**
+     * Key Vault Secret Name for ILB App Service Environment default SSL
+     * certificate.
+     */
+    @JsonProperty(value = "sslCertKeyVaultSecretName")
+    private String sslCertKeyVaultSecretName;
+
     /**
      * Get name of the App Service Environment.
      *
@@ -821,4 +834,44 @@ public AppServiceEnvironmentInner withHasLinuxWorkers(Boolean hasLinuxWorkers) {
         return this;
     }
 
+    /**
+     * Get key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultId value
+     */
+    public String sslCertKeyVaultId() {
+        return this.sslCertKeyVaultId;
+    }
+
+    /**
+     * Set key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultId the sslCertKeyVaultId value to set
+     * @return the AppServiceEnvironmentInner object itself.
+     */
+    public AppServiceEnvironmentInner withSslCertKeyVaultId(String sslCertKeyVaultId) {
+        this.sslCertKeyVaultId = sslCertKeyVaultId;
+        return this;
+    }
+
+    /**
+     * Get key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultSecretName value
+     */
+    public String sslCertKeyVaultSecretName() {
+        return this.sslCertKeyVaultSecretName;
+    }
+
+    /**
+     * Set key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultSecretName the sslCertKeyVaultSecretName value to set
+     * @return the AppServiceEnvironmentInner object itself.
+     */
+    public AppServiceEnvironmentInner withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName) {
+        this.sslCertKeyVaultSecretName = sslCertKeyVaultSecretName;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceImpl.java
index 60b94949cfd9..6a0ee90d1899 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceImpl.java
@@ -25,9 +25,9 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.StampCapacity;
 import rx.functions.Func1;
 
-class AppServiceEnvironmentResourceImpl extends GroupableResourceCoreImpl<AppServiceEnvironmentResource, AppServiceEnvironmentResourceInner, AppServiceEnvironmentResourceImpl, AppServiceManager> implements AppServiceEnvironmentResource, AppServiceEnvironmentResource.Definition, AppServiceEnvironmentResource.Update {
+class AppServiceEnvironmentResourceImpl extends GroupableResourceCoreImpl<AppServiceEnvironmentResource, AppServiceEnvironmentResourceInner, AppServiceEnvironmentResourceImpl, CertificateRegistrationManager> implements AppServiceEnvironmentResource, AppServiceEnvironmentResource.Definition, AppServiceEnvironmentResource.Update {
     private AppServiceEnvironmentPatchResource updateParameter;
-    AppServiceEnvironmentResourceImpl(String name, AppServiceEnvironmentResourceInner inner, AppServiceManager manager) {
+    AppServiceEnvironmentResourceImpl(String name, AppServiceEnvironmentResourceInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new AppServiceEnvironmentPatchResource();
     }
@@ -216,6 +216,16 @@ public String resourceGroup() {
         return this.inner().resourceGroup();
     }
 
+    @Override
+    public String sslCertKeyVaultId() {
+        return this.inner().sslCertKeyVaultId();
+    }
+
+    @Override
+    public String sslCertKeyVaultSecretName() {
+        return this.inner().sslCertKeyVaultSecretName();
+    }
+
     @Override
     public HostingEnvironmentStatus status() {
         return this.inner().status();
@@ -415,6 +425,26 @@ public AppServiceEnvironmentResourceImpl withNetworkAccessControlList(List<Netwo
         return this;
     }
 
+    @Override
+    public AppServiceEnvironmentResourceImpl withSslCertKeyVaultId(String sslCertKeyVaultId) {
+        if (isInCreateMode()) {
+            this.inner().withSslCertKeyVaultId(sslCertKeyVaultId);
+        } else {
+            this.updateParameter.withSslCertKeyVaultId(sslCertKeyVaultId);
+        }
+        return this;
+    }
+
+    @Override
+    public AppServiceEnvironmentResourceImpl withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName) {
+        if (isInCreateMode()) {
+            this.inner().withSslCertKeyVaultSecretName(sslCertKeyVaultSecretName);
+        } else {
+            this.updateParameter.withSslCertKeyVaultSecretName(sslCertKeyVaultSecretName);
+        }
+        return this;
+    }
+
     @Override
     public AppServiceEnvironmentResourceImpl withSuspended(Boolean suspended) {
         if (isInCreateMode()) {
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceInner.java
index d57918b91ad1..8161a317832a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentResourceInner.java
@@ -267,6 +267,19 @@ public class AppServiceEnvironmentResourceInner extends Resource {
     @JsonProperty(value = "properties.hasLinuxWorkers")
     private Boolean hasLinuxWorkers;
 
+    /**
+     * Key Vault ID for ILB App Service Environment default SSL certificate.
+     */
+    @JsonProperty(value = "properties.sslCertKeyVaultId")
+    private String sslCertKeyVaultId;
+
+    /**
+     * Key Vault Secret Name for ILB App Service Environment default SSL
+     * certificate.
+     */
+    @JsonProperty(value = "properties.sslCertKeyVaultSecretName")
+    private String sslCertKeyVaultSecretName;
+
     /**
      * Kind of resource.
      */
@@ -830,6 +843,46 @@ public AppServiceEnvironmentResourceInner withHasLinuxWorkers(Boolean hasLinuxWo
         return this;
     }
 
+    /**
+     * Get key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultId value
+     */
+    public String sslCertKeyVaultId() {
+        return this.sslCertKeyVaultId;
+    }
+
+    /**
+     * Set key Vault ID for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultId the sslCertKeyVaultId value to set
+     * @return the AppServiceEnvironmentResourceInner object itself.
+     */
+    public AppServiceEnvironmentResourceInner withSslCertKeyVaultId(String sslCertKeyVaultId) {
+        this.sslCertKeyVaultId = sslCertKeyVaultId;
+        return this;
+    }
+
+    /**
+     * Get key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @return the sslCertKeyVaultSecretName value
+     */
+    public String sslCertKeyVaultSecretName() {
+        return this.sslCertKeyVaultSecretName;
+    }
+
+    /**
+     * Set key Vault Secret Name for ILB App Service Environment default SSL certificate.
+     *
+     * @param sslCertKeyVaultSecretName the sslCertKeyVaultSecretName value to set
+     * @return the AppServiceEnvironmentResourceInner object itself.
+     */
+    public AppServiceEnvironmentResourceInner withSslCertKeyVaultSecretName(String sslCertKeyVaultSecretName) {
+        this.sslCertKeyVaultSecretName = sslCertKeyVaultSecretName;
+        return this;
+    }
+
     /**
      * Get kind of resource.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsImpl.java
index 29d86947428a..0bc9b637f30d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsImpl.java
@@ -36,14 +36,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.WorkerPools;
 
 class AppServiceEnvironmentsImpl extends WrapperImpl<AppServiceEnvironmentsInner> implements AppServiceEnvironments {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    AppServiceEnvironmentsImpl(AppServiceManager manager) {
+    AppServiceEnvironmentsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().appServiceEnvironments());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -229,12 +229,6 @@ public Sites call(SiteInner inner) {
         });
     }
 
-    @Override
-    public Completable syncVirtualNetworkInfoAsync(String resourceGroupName, String name) {
-        AppServiceEnvironmentsInner client = this.inner();
-        return client.syncVirtualNetworkInfoAsync(resourceGroupName, name).toCompletable();
-    }
-
     @Override
     public Observable<StampCapacity> listCapacitiesAsync(final String resourceGroupName, final String name) {
         AppServiceEnvironmentsInner client = this.inner();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsInner.java
index 327c4c75a184..034cf74d94a5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServiceEnvironmentsInner.java
@@ -209,10 +209,6 @@ interface AppServiceEnvironmentsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend")
         Observable<Response<ResponseBody>> beginSuspend(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.AppServiceEnvironments syncVirtualNetworkInfo" })
-        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/syncVirtualNetwork")
-        Observable<Response<ResponseBody>> syncVirtualNetworkInfo(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
-
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.AppServiceEnvironments listUsages" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages")
         Observable<Response<ResponseBody>> listUsages(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -2207,7 +2203,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -2230,7 +2226,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -2254,7 +2250,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -2275,7 +2271,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -2300,7 +2296,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param name Name of the App Service Environment.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -3512,7 +3508,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param endTime End time of the metrics query.
      * @param timeGrain Time granularity of the metrics query.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -3538,7 +3534,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param endTime End time of the metrics query.
      * @param timeGrain Time granularity of the metrics query.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -3565,7 +3561,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param endTime End time of the metrics query.
      * @param timeGrain Time granularity of the metrics query.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -3589,7 +3585,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param endTime End time of the metrics query.
      * @param timeGrain Time granularity of the metrics query.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -3617,7 +3613,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param endTime End time of the metrics query.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param timeGrain Time granularity of the metrics query.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -4992,96 +4988,6 @@ private ServiceResponse<PageImpl<SiteInner>> beginSuspendDelegate(Response<Respo
                 .build(response);
     }
 
-    /**
-     * Resume an App Service Environment.
-     * Resume an App Service Environment.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the App Service Environment.
-     * @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
-     */
-    public void syncVirtualNetworkInfo(String resourceGroupName, String name) {
-        syncVirtualNetworkInfoWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
-    }
-
-    /**
-     * Resume an App Service Environment.
-     * Resume an App Service Environment.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the App Service Environment.
-     * @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<Void> syncVirtualNetworkInfoAsync(String resourceGroupName, String name, final ServiceCallback<Void> serviceCallback) {
-        return ServiceFuture.fromResponse(syncVirtualNetworkInfoWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
-    }
-
-    /**
-     * Resume an App Service Environment.
-     * Resume an App Service Environment.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the App Service Environment.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceResponse} object if successful.
-     */
-    public Observable<Void> syncVirtualNetworkInfoAsync(String resourceGroupName, String name) {
-        return syncVirtualNetworkInfoWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Void>, Void>() {
-            @Override
-            public Void call(ServiceResponse<Void> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Resume an App Service Environment.
-     * Resume an App Service Environment.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the App Service Environment.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the {@link ServiceResponse} object if successful.
-     */
-    public Observable<ServiceResponse<Void>> syncVirtualNetworkInfoWithServiceResponseAsync(String resourceGroupName, String name) {
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.syncVirtualNetworkInfo(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
-                @Override
-                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<Void> clientResponse = syncVirtualNetworkInfoDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
-    private ServiceResponse<Void> syncVirtualNetworkInfoDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<Void>() { }.getType())
-                .register(202, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
-                .build(response);
-    }
-
     /**
      * Get global usage metrics of an App Service Environment.
      * Get global usage metrics of an App Service Environment.
@@ -5210,7 +5116,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(Response<Respo
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -5232,7 +5138,7 @@ public Page<CsmUsageQuotaInner> nextPage(String nextPageLink) {
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -5255,7 +5161,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(String nextPag
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -5275,7 +5181,7 @@ public Page<CsmUsageQuotaInner> call(ServiceResponse<Page<CsmUsageQuotaInner>> r
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service Environment.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -5299,7 +5205,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(ServiceRespons
      *
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param name Name of the App Service Environment.
-    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;CsmUsageQuotaInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -6160,7 +6066,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param workerPoolName Name of the worker pool.
      * @param instance Name of the instance in the worker pool.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -6185,7 +6091,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param workerPoolName Name of the worker pool.
      * @param instance Name of the instance in the worker pool.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -6211,7 +6117,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param workerPoolName Name of the worker pool.
      * @param instance Name of the instance in the worker pool.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -6234,7 +6140,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param workerPoolName Name of the worker pool.
      * @param instance Name of the instance in the worker pool.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -6261,7 +6167,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param workerPoolName Name of the worker pool.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param instance Name of the instance in the worker pool.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -6580,7 +6486,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param name Name of the App Service Environment.
      * @param workerPoolName Name of worker pool
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -6604,7 +6510,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param name Name of the App Service Environment.
      * @param workerPoolName Name of worker pool
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -6629,7 +6535,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param name Name of the App Service Environment.
      * @param workerPoolName Name of worker pool
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -6651,7 +6557,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param name Name of the App Service Environment.
      * @param workerPoolName Name of worker pool
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -6677,7 +6583,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param name Name of the App Service Environment.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param workerPoolName Name of worker pool
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanImpl.java
index a53c00734448..a9f6aea83618 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanImpl.java
@@ -19,9 +19,9 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SkuDescription;
 import rx.functions.Func1;
 
-class AppServicePlanImpl extends GroupableResourceCoreImpl<AppServicePlan, AppServicePlanInner, AppServicePlanImpl, AppServiceManager> implements AppServicePlan, AppServicePlan.Definition, AppServicePlan.Update {
+class AppServicePlanImpl extends GroupableResourceCoreImpl<AppServicePlan, AppServicePlanInner, AppServicePlanImpl, CertificateRegistrationManager> implements AppServicePlan, AppServicePlan.Definition, AppServicePlan.Update {
     private AppServicePlanPatchResource updateParameter;
-    AppServicePlanImpl(String name, AppServicePlanInner inner, AppServiceManager manager) {
+    AppServicePlanImpl(String name, AppServicePlanInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new AppServicePlanPatchResource();
     }
@@ -74,6 +74,11 @@ public String adminSiteName() {
         return this.inner().adminSiteName();
     }
 
+    @Override
+    public DateTime freeOfferExpirationTime() {
+        return this.inner().freeOfferExpirationTime();
+    }
+
     @Override
     public String geoRegion() {
         return this.inner().geoRegion();
@@ -84,6 +89,11 @@ public HostingEnvironmentProfile hostingEnvironmentProfile() {
         return this.inner().hostingEnvironmentProfile();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public Boolean isSpot() {
         return this.inner().isSpot();
@@ -180,6 +190,16 @@ public AppServicePlanImpl withAdminSiteName(String adminSiteName) {
         return this;
     }
 
+    @Override
+    public AppServicePlanImpl withFreeOfferExpirationTime(DateTime freeOfferExpirationTime) {
+        if (isInCreateMode()) {
+            this.inner().withFreeOfferExpirationTime(freeOfferExpirationTime);
+        } else {
+            this.updateParameter.withFreeOfferExpirationTime(freeOfferExpirationTime);
+        }
+        return this;
+    }
+
     @Override
     public AppServicePlanImpl withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile) {
         if (isInCreateMode()) {
@@ -190,6 +210,16 @@ public AppServicePlanImpl withHostingEnvironmentProfile(HostingEnvironmentProfil
         return this;
     }
 
+    @Override
+    public AppServicePlanImpl withHyperV(Boolean hyperV) {
+        if (isInCreateMode()) {
+            this.inner().withHyperV(hyperV);
+        } else {
+            this.updateParameter.withHyperV(hyperV);
+        }
+        return this;
+    }
+
     @Override
     public AppServicePlanImpl withIsSpot(Boolean isSpot) {
         if (isInCreateMode()) {
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanInner.java
index 8c81eaa04edd..f806d405a5b4 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlanInner.java
@@ -96,6 +96,12 @@ public class AppServicePlanInner extends Resource {
     @JsonProperty(value = "properties.spotExpirationTime")
     private DateTime spotExpirationTime;
 
+    /**
+     * The time when the server farm free offer expires.
+     */
+    @JsonProperty(value = "properties.freeOfferExpirationTime")
+    private DateTime freeOfferExpirationTime;
+
     /**
      * Resource group of the App Service plan.
      */
@@ -110,12 +116,19 @@ public class AppServicePlanInner extends Resource {
     private Boolean reserved;
 
     /**
-     * If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;,
-     * &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Obsolete: If Hyper-V container app service plan
+     * &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      */
     @JsonProperty(value = "properties.isXenon")
     private Boolean isXenon;
 
+    /**
+     * If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;,
+     * &lt;code&gt;false&lt;/code&gt; otherwise.
+     */
+    @JsonProperty(value = "properties.hyperV")
+    private Boolean hyperV;
+
     /**
      * Scaling worker count.
      */
@@ -314,6 +327,26 @@ public AppServicePlanInner withSpotExpirationTime(DateTime spotExpirationTime) {
         return this;
     }
 
+    /**
+     * Get the time when the server farm free offer expires.
+     *
+     * @return the freeOfferExpirationTime value
+     */
+    public DateTime freeOfferExpirationTime() {
+        return this.freeOfferExpirationTime;
+    }
+
+    /**
+     * Set the time when the server farm free offer expires.
+     *
+     * @param freeOfferExpirationTime the freeOfferExpirationTime value to set
+     * @return the AppServicePlanInner object itself.
+     */
+    public AppServicePlanInner withFreeOfferExpirationTime(DateTime freeOfferExpirationTime) {
+        this.freeOfferExpirationTime = freeOfferExpirationTime;
+        return this;
+    }
+
     /**
      * Get resource group of the App Service plan.
      *
@@ -344,7 +377,7 @@ public AppServicePlanInner withReserved(Boolean reserved) {
     }
 
     /**
-     * Get if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Get obsolete: If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      *
      * @return the isXenon value
      */
@@ -353,7 +386,7 @@ public Boolean isXenon() {
     }
 
     /**
-     * Set if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     * Set obsolete: If Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
      *
      * @param isXenon the isXenon value to set
      * @return the AppServicePlanInner object itself.
@@ -363,6 +396,26 @@ public AppServicePlanInner withIsXenon(Boolean isXenon) {
         return this;
     }
 
+    /**
+     * Get if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     *
+     * @return the hyperV value
+     */
+    public Boolean hyperV() {
+        return this.hyperV;
+    }
+
+    /**
+     * Set if Hyper-V container app service plan &lt;code&gt;true&lt;/code&gt;, &lt;code&gt;false&lt;/code&gt; otherwise.
+     *
+     * @param hyperV the hyperV value to set
+     * @return the AppServicePlanInner object itself.
+     */
+    public AppServicePlanInner withHyperV(Boolean hyperV) {
+        this.hyperV = hyperV;
+        return this;
+    }
+
     /**
      * Get scaling worker count.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansImpl.java
index 7fefab5436f1..7d970f83cad6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansImpl.java
@@ -31,14 +31,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.VnetRoute;
 
 class AppServicePlansImpl extends WrapperImpl<AppServicePlansInner> implements AppServicePlans {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    AppServicePlansImpl(AppServiceManager manager) {
+    AppServicePlansImpl(CertificateRegistrationManager manager) {
         super(manager.inner().appServicePlans());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansInner.java
index e1bd316b4b92..0ecf78418924 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AppServicePlansInner.java
@@ -2052,7 +2052,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service plan.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -2075,7 +2075,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service plan.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -2099,7 +2099,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service plan.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -2120,7 +2120,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the App Service plan.
      * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -2145,7 +2145,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param name Name of the App Service plan.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The default is &lt;code&gt;false&lt;/code&gt;.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ApplicationStackImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ApplicationStackImpl.java
index 8640f6dc2347..4e67514c0cc0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ApplicationStackImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ApplicationStackImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.StackMajorVersion;
 
 class ApplicationStackImpl extends WrapperImpl<ApplicationStackInner> implements ApplicationStack {
-    private final AppServiceManager manager;
-    ApplicationStackImpl(ApplicationStackInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    ApplicationStackImpl(ApplicationStackInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceImpl.java
new file mode 100644
index 000000000000..7d74bfbbc4d4
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceImpl.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStoragePropertyDictionaryResource;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStorageInfoValue;
+
+class AzureStoragePropertyDictionaryResourceImpl extends WrapperImpl<AzureStoragePropertyDictionaryResourceInner> implements AzureStoragePropertyDictionaryResource {
+    private final CertificateRegistrationManager manager;
+    AzureStoragePropertyDictionaryResourceImpl(AzureStoragePropertyDictionaryResourceInner inner, CertificateRegistrationManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Map<String, AzureStorageInfoValue> properties() {
+        return this.inner().properties();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceInner.java
new file mode 100644
index 000000000000..f265d4c61dfc
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/AzureStoragePropertyDictionaryResourceInner.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import java.util.Map;
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStorageInfoValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.management.appservice.v2018_02_01.ProxyOnlyResource;
+
+/**
+ * AzureStorageInfo dictionary resource.
+ */
+public class AzureStoragePropertyDictionaryResourceInner extends ProxyOnlyResource {
+    /**
+     * Azure storage accounts.
+     */
+    @JsonProperty(value = "properties")
+    private Map<String, AzureStorageInfoValue> properties;
+
+    /**
+     * Get azure storage accounts.
+     *
+     * @return the properties value
+     */
+    public Map<String, AzureStorageInfoValue> properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set azure storage accounts.
+     *
+     * @param properties the properties value to set
+     * @return the AzureStoragePropertyDictionaryResourceInner object itself.
+     */
+    public AzureStoragePropertyDictionaryResourceInner withProperties(Map<String, AzureStorageInfoValue> properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupItemImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupItemImpl.java
index 9d036ccebb5a..d8e13e76677c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupItemImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupItemImpl.java
@@ -17,12 +17,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.BackupItemStatus;
 
 class BackupItemImpl extends IndexableRefreshableWrapperImpl<BackupItem, BackupItemInner> implements BackupItem {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String backupId;
 
-    BackupItemImpl(BackupItemInner inner,  AppServiceManager manager) {
+    BackupItemImpl(BackupItemInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class BackupItemImpl extends IndexableRefreshableWrapperImpl<BackupItem, BackupI
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestImpl.java
index 898af0308d1b..9ba81549824a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestImpl.java
@@ -15,17 +15,22 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DatabaseBackupSetting;
 
 class BackupRequestImpl extends WrapperImpl<BackupRequestInner> implements BackupRequest {
-    private final AppServiceManager manager;
-    BackupRequestImpl(BackupRequestInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    BackupRequestImpl(BackupRequestInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
+    @Override
+    public String backupName() {
+        return this.inner().backupName();
+    }
+
     @Override
     public BackupSchedule backupSchedule() {
         return this.inner().backupSchedule();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestInner.java
index e761a1d8b2cb..581fe11bb33d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BackupRequestInner.java
@@ -20,6 +20,12 @@
  */
 @JsonFlatten
 public class BackupRequestInner extends ProxyOnlyResource {
+    /**
+     * Name of the backup.
+     */
+    @JsonProperty(value = "properties.backupName")
+    private String backupName;
+
     /**
      * True if the backup schedule is enabled (must be included in that case),
      * false if the backup schedule should be disabled.
@@ -45,6 +51,26 @@ public class BackupRequestInner extends ProxyOnlyResource {
     @JsonProperty(value = "properties.databases")
     private List<DatabaseBackupSetting> databases;
 
+    /**
+     * Get name of the backup.
+     *
+     * @return the backupName value
+     */
+    public String backupName() {
+        return this.backupName;
+    }
+
+    /**
+     * Set name of the backup.
+     *
+     * @param backupName the backupName value to set
+     * @return the BackupRequestInner object itself.
+     */
+    public BackupRequestInner withBackupName(String backupName) {
+        this.backupName = backupName;
+        return this;
+    }
+
     /**
      * Get true if the backup schedule is enabled (must be included in that case), false if the backup schedule should be disabled.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BillingMeterInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BillingMeterInner.java
index 8cee7b82e345..4c0defbf3dc2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BillingMeterInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/BillingMeterInner.java
@@ -48,6 +48,12 @@ public class BillingMeterInner extends ProxyOnlyResource {
     @JsonProperty(value = "properties.resourceType")
     private String resourceType;
 
+    /**
+     * App Service OS type meter used for.
+     */
+    @JsonProperty(value = "properties.osType")
+    private String osType;
+
     /**
      * Get meter GUID onboarded in Commerce.
      *
@@ -148,4 +154,24 @@ public BillingMeterInner withResourceType(String resourceType) {
         return this;
     }
 
+    /**
+     * Get app Service OS type meter used for.
+     *
+     * @return the osType value
+     */
+    public String osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set app Service OS type meter used for.
+     *
+     * @param osType the osType value to set
+     * @return the BillingMeterInner object itself.
+     */
+    public BillingMeterInner withOsType(String osType) {
+        this.osType = osType;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CapabilityImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CapabilityImpl.java
index 6d26a463cdbd..25252815599f 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CapabilityImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CapabilityImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class CapabilityImpl extends WrapperImpl<CapabilityInner> implements Capability {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    CapabilityImpl(CapabilityInner inner,  AppServiceManager manager) {
+    CapabilityImpl(CapabilityInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateEmailImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateEmailImpl.java
index 3f030093ed7f..d0a62ecf079d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateEmailImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateEmailImpl.java
@@ -13,14 +13,14 @@
 import org.joda.time.DateTime;
 
 class CertificateEmailImpl extends WrapperImpl<CertificateEmailInner> implements CertificateEmail {
-    private final AppServiceManager manager;
-    CertificateEmailImpl(CertificateEmailInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    CertificateEmailImpl(CertificateEmailInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateImpl.java
index b8c0b5d34c49..583a814a9db6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateImpl.java
@@ -18,9 +18,9 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.KeyVaultSecretStatus;
 import rx.functions.Func1;
 
-class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, AppServiceManager> implements Certificate, Certificate.Definition, Certificate.Update {
+class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, CertificateRegistrationManager> implements Certificate, Certificate.Definition, Certificate.Update {
     private CertificatePatchResource updateParameter;
-    CertificateImpl(String name, CertificateInner inner, AppServiceManager manager) {
+    CertificateImpl(String name, CertificateInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new CertificatePatchResource();
     }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateOrderActionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateOrderActionImpl.java
index ab5bca8f95de..bb7d0facacd5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateOrderActionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateOrderActionImpl.java
@@ -14,14 +14,14 @@
 import org.joda.time.DateTime;
 
 class CertificateOrderActionImpl extends WrapperImpl<CertificateOrderActionInner> implements CertificateOrderAction {
-    private final AppServiceManager manager;
-    CertificateOrderActionImpl(CertificateOrderActionInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    CertificateOrderActionImpl(CertificateOrderActionInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationManager.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationManager.java
new file mode 100644
index 000000000000..c1c714f68b99
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationManager.java
@@ -0,0 +1,255 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.appservice.v2018_02_01.AppServiceCertificateOrders;
+import com.microsoft.azure.management.appservice.v2018_02_01.CertificateRegistrationProviders;
+import com.microsoft.azure.management.appservice.v2018_02_01.Domains;
+import com.microsoft.azure.management.appservice.v2018_02_01.TopLevelDomains;
+import com.microsoft.azure.management.appservice.v2018_02_01.DomainRegistrationProviders;
+import com.microsoft.azure.management.appservice.v2018_02_01.Certificates;
+import com.microsoft.azure.management.appservice.v2018_02_01.DeletedWebApps;
+import com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics;
+import com.microsoft.azure.management.appservice.v2018_02_01.Providers;
+import com.microsoft.azure.management.appservice.v2018_02_01.Recommendations;
+import com.microsoft.azure.management.appservice.v2018_02_01.WebApps;
+import com.microsoft.azure.management.appservice.v2018_02_01.AppServiceEnvironments;
+import com.microsoft.azure.management.appservice.v2018_02_01.AppServicePlans;
+import com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure CertificateRegistration resource management.
+ */
+public final class CertificateRegistrationManager extends ManagerCore<CertificateRegistrationManager, WebSiteManagementClientImpl> {
+    private AppServiceCertificateOrders appServiceCertificateOrders;
+    private CertificateRegistrationProviders certificateRegistrationProviders;
+    private Domains domains;
+    private TopLevelDomains topLevelDomains;
+    private DomainRegistrationProviders domainRegistrationProviders;
+    private Certificates certificates;
+    private DeletedWebApps deletedWebApps;
+    private Diagnostics diagnostics;
+    private Providers providers;
+    private Recommendations recommendations;
+    private WebApps webApps;
+    private AppServiceEnvironments appServiceEnvironments;
+    private AppServicePlans appServicePlans;
+    private ResourceHealthMetadatas resourceHealthMetadatas;
+    /**
+    * Get a Configurable instance that can be used to create CertificateRegistrationManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new CertificateRegistrationManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of CertificateRegistrationManager that exposes CertificateRegistration resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the CertificateRegistrationManager
+    */
+    public static CertificateRegistrationManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new CertificateRegistrationManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of CertificateRegistrationManager that exposes CertificateRegistration resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the CertificateRegistrationManager
+    */
+    public static CertificateRegistrationManager authenticate(RestClient restClient, String subscriptionId) {
+        return new CertificateRegistrationManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of CertificateRegistrationManager that exposes CertificateRegistration management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing CertificateRegistration management API entry points that work across subscriptions
+        */
+        CertificateRegistrationManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage AppServiceCertificateOrders.
+     */
+    public AppServiceCertificateOrders appServiceCertificateOrders() {
+        if (this.appServiceCertificateOrders == null) {
+            this.appServiceCertificateOrders = new AppServiceCertificateOrdersImpl(this);
+        }
+        return this.appServiceCertificateOrders;
+    }
+
+    /**
+     * @return Entry point to manage CertificateRegistrationProviders.
+     */
+    public CertificateRegistrationProviders certificateRegistrationProviders() {
+        if (this.certificateRegistrationProviders == null) {
+            this.certificateRegistrationProviders = new CertificateRegistrationProvidersImpl(this);
+        }
+        return this.certificateRegistrationProviders;
+    }
+
+    /**
+     * @return Entry point to manage Domains.
+     */
+    public Domains domains() {
+        if (this.domains == null) {
+            this.domains = new DomainsImpl(this);
+        }
+        return this.domains;
+    }
+
+    /**
+     * @return Entry point to manage TopLevelDomains.
+     */
+    public TopLevelDomains topLevelDomains() {
+        if (this.topLevelDomains == null) {
+            this.topLevelDomains = new TopLevelDomainsImpl(this);
+        }
+        return this.topLevelDomains;
+    }
+
+    /**
+     * @return Entry point to manage DomainRegistrationProviders.
+     */
+    public DomainRegistrationProviders domainRegistrationProviders() {
+        if (this.domainRegistrationProviders == null) {
+            this.domainRegistrationProviders = new DomainRegistrationProvidersImpl(this);
+        }
+        return this.domainRegistrationProviders;
+    }
+
+    /**
+     * @return Entry point to manage Certificates.
+     */
+    public Certificates certificates() {
+        if (this.certificates == null) {
+            this.certificates = new CertificatesImpl(this);
+        }
+        return this.certificates;
+    }
+
+    /**
+     * @return Entry point to manage DeletedWebApps.
+     */
+    public DeletedWebApps deletedWebApps() {
+        if (this.deletedWebApps == null) {
+            this.deletedWebApps = new DeletedWebAppsImpl(this);
+        }
+        return this.deletedWebApps;
+    }
+
+    /**
+     * @return Entry point to manage Diagnostics.
+     */
+    public Diagnostics diagnostics() {
+        if (this.diagnostics == null) {
+            this.diagnostics = new DiagnosticsImpl(this);
+        }
+        return this.diagnostics;
+    }
+
+    /**
+     * @return Entry point to manage Providers.
+     */
+    public Providers providers() {
+        if (this.providers == null) {
+            this.providers = new ProvidersImpl(this);
+        }
+        return this.providers;
+    }
+
+    /**
+     * @return Entry point to manage Recommendations.
+     */
+    public Recommendations recommendations() {
+        if (this.recommendations == null) {
+            this.recommendations = new RecommendationsImpl(this);
+        }
+        return this.recommendations;
+    }
+
+    /**
+     * @return Entry point to manage WebApps.
+     */
+    public WebApps webApps() {
+        if (this.webApps == null) {
+            this.webApps = new WebAppsImpl(this);
+        }
+        return this.webApps;
+    }
+
+    /**
+     * @return Entry point to manage AppServiceEnvironments.
+     */
+    public AppServiceEnvironments appServiceEnvironments() {
+        if (this.appServiceEnvironments == null) {
+            this.appServiceEnvironments = new AppServiceEnvironmentsImpl(this);
+        }
+        return this.appServiceEnvironments;
+    }
+
+    /**
+     * @return Entry point to manage AppServicePlans.
+     */
+    public AppServicePlans appServicePlans() {
+        if (this.appServicePlans == null) {
+            this.appServicePlans = new AppServicePlansImpl(this);
+        }
+        return this.appServicePlans;
+    }
+
+    /**
+     * @return Entry point to manage ResourceHealthMetadatas.
+     */
+    public ResourceHealthMetadatas resourceHealthMetadatas() {
+        if (this.resourceHealthMetadatas == null) {
+            this.resourceHealthMetadatas = new ResourceHealthMetadatasImpl(this);
+        }
+        return this.resourceHealthMetadatas;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public CertificateRegistrationManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return CertificateRegistrationManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private CertificateRegistrationManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new WebSiteManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationProvidersImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationProvidersImpl.java
index f02900de6fa8..808389f33f0d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationProvidersImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificateRegistrationProvidersImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CsmOperationDescription;
 
 class CertificateRegistrationProvidersImpl extends WrapperImpl<CertificateRegistrationProvidersInner> implements CertificateRegistrationProviders {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    CertificateRegistrationProvidersImpl(AppServiceManager manager) {
+    CertificateRegistrationProvidersImpl(CertificateRegistrationManager manager) {
         super(manager.inner().certificateRegistrationProviders());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificatesImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificatesImpl.java
index 84256c75e842..7a90aea6dc1a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificatesImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CertificatesImpl.java
@@ -23,8 +23,8 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 
-class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, AppServiceManager>  implements Certificates {
-    protected CertificatesImpl(AppServiceManager manager) {
+class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, CertificateRegistrationManager>  implements Certificates {
+    protected CertificatesImpl(CertificateRegistrationManager manager) {
         super(manager.inner().certificates(), manager);
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ConnectionStringDictionaryImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ConnectionStringDictionaryImpl.java
index 1a4177624c73..1073f001071c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ConnectionStringDictionaryImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ConnectionStringDictionaryImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ConnStringValueTypePair;
 
 class ConnectionStringDictionaryImpl extends WrapperImpl<ConnectionStringDictionaryInner> implements ConnectionStringDictionary {
-    private final AppServiceManager manager;
-    ConnectionStringDictionaryImpl(ConnectionStringDictionaryInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    ConnectionStringDictionaryImpl(ConnectionStringDictionaryInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ContinuousWebJobImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ContinuousWebJobImpl.java
index 3a4a9b2be615..de4e836ec464 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ContinuousWebJobImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ContinuousWebJobImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.WebJobType;
 
 class ContinuousWebJobImpl extends IndexableRefreshableWrapperImpl<ContinuousWebJob, ContinuousWebJobInner> implements ContinuousWebJob {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
 
-    ContinuousWebJobImpl(ContinuousWebJobInner inner,  AppServiceManager manager) {
+    ContinuousWebJobImpl(ContinuousWebJobInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -30,7 +30,7 @@ class ContinuousWebJobImpl extends IndexableRefreshableWrapperImpl<ContinuousWeb
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CsmOperationDescriptionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CsmOperationDescriptionImpl.java
index 83cea4dc2572..088df6bc9550 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CsmOperationDescriptionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CsmOperationDescriptionImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CsmOperationDescriptionProperties;
 
 class CsmOperationDescriptionImpl extends WrapperImpl<CsmOperationDescriptionInner> implements CsmOperationDescription {
-    private final AppServiceManager manager;
-    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CustomHostnameAnalysisResultImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CustomHostnameAnalysisResultImpl.java
index e8b8fef5bda4..6f73e246d3e1 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CustomHostnameAnalysisResultImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/CustomHostnameAnalysisResultImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DnsVerificationTestResult;
 
 class CustomHostnameAnalysisResultImpl extends WrapperImpl<CustomHostnameAnalysisResultInner> implements CustomHostnameAnalysisResult {
-    private final AppServiceManager manager;
-    CustomHostnameAnalysisResultImpl(CustomHostnameAnalysisResultInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    CustomHostnameAnalysisResultImpl(CustomHostnameAnalysisResultInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteImpl.java
index e608bff8b175..ab274ae645b0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DeletedSiteImpl extends WrapperImpl<DeletedSiteInner> implements DeletedSite {
-    private final AppServiceManager manager;
-    DeletedSiteImpl(DeletedSiteInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    DeletedSiteImpl(DeletedSiteInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -28,6 +28,11 @@ public Integer deletedSiteId() {
         return this.inner().deletedSiteId();
     }
 
+    @Override
+    public String deletedSiteKind() {
+        return this.inner().deletedSiteKind();
+    }
+
     @Override
     public String deletedSiteName() {
         return this.inner().deletedSiteName();
@@ -38,6 +43,21 @@ public String deletedTimestamp() {
         return this.inner().deletedTimestamp();
     }
 
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
     @Override
     public String resourceGroup() {
         return this.inner().resourceGroup();
@@ -53,4 +73,9 @@ public String subscription() {
         return this.inner().subscription();
     }
 
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteInner.java
index 8a6bda15e34d..3ae9cf20ca7b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedSiteInner.java
@@ -9,47 +9,56 @@
 package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.management.appservice.v2018_02_01.ProxyOnlyResource;
 
 /**
  * A deleted app.
  */
-public class DeletedSiteInner {
+@JsonFlatten
+public class DeletedSiteInner extends ProxyOnlyResource {
     /**
      * Numeric id for the deleted site.
      */
-    @JsonProperty(value = "deletedSiteId")
+    @JsonProperty(value = "properties.deletedSiteId", access = JsonProperty.Access.WRITE_ONLY)
     private Integer deletedSiteId;
 
     /**
      * Time in UTC when the app was deleted.
      */
-    @JsonProperty(value = "deletedTimestamp", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "properties.deletedTimestamp", access = JsonProperty.Access.WRITE_ONLY)
     private String deletedTimestamp;
 
     /**
      * Subscription containing the deleted site.
      */
-    @JsonProperty(value = "subscription", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "properties.subscription", access = JsonProperty.Access.WRITE_ONLY)
     private String subscription;
 
     /**
      * ResourceGroup that contained the deleted site.
      */
-    @JsonProperty(value = "resourceGroup", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "properties.resourceGroup", access = JsonProperty.Access.WRITE_ONLY)
     private String resourceGroup;
 
     /**
      * Name of the deleted site.
      */
-    @JsonProperty(value = "deletedSiteName", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "properties.deletedSiteName", access = JsonProperty.Access.WRITE_ONLY)
     private String deletedSiteName;
 
     /**
      * Slot of the deleted site.
      */
-    @JsonProperty(value = "slot", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "properties.slot", access = JsonProperty.Access.WRITE_ONLY)
     private String slot;
 
+    /**
+     * Kind of site that was deleted.
+     */
+    @JsonProperty(value = "properties.kind", access = JsonProperty.Access.WRITE_ONLY)
+    private String deletedSiteKind;
+
     /**
      * Get numeric id for the deleted site.
      *
@@ -59,17 +68,6 @@ public Integer deletedSiteId() {
         return this.deletedSiteId;
     }
 
-    /**
-     * Set numeric id for the deleted site.
-     *
-     * @param deletedSiteId the deletedSiteId value to set
-     * @return the DeletedSiteInner object itself.
-     */
-    public DeletedSiteInner withDeletedSiteId(Integer deletedSiteId) {
-        this.deletedSiteId = deletedSiteId;
-        return this;
-    }
-
     /**
      * Get time in UTC when the app was deleted.
      *
@@ -115,4 +113,13 @@ public String slot() {
         return this.slot;
     }
 
+    /**
+     * Get kind of site that was deleted.
+     *
+     * @return the deletedSiteKind value
+     */
+    public String deletedSiteKind() {
+        return this.deletedSiteKind;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedWebAppsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedWebAppsImpl.java
index 447a61e5b921..18515771c1d9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedWebAppsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeletedWebAppsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DeletedSite;
 
 class DeletedWebAppsImpl extends WrapperImpl<DeletedWebAppsInner> implements DeletedWebApps {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    DeletedWebAppsImpl(AppServiceManager manager) {
+    DeletedWebAppsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().deletedWebApps());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeploymentImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeploymentImpl.java
index 303462f7c2d7..5343b88d833b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeploymentImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DeploymentImpl.java
@@ -14,12 +14,12 @@
 import org.joda.time.DateTime;
 
 class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner, DeploymentImpl> implements Deployment, Deployment.Definition, Deployment.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String id;
 
-    DeploymentImpl(String name, AppServiceManager manager) {
+    DeploymentImpl(String name, CertificateRegistrationManager manager) {
         super(name, new DeploymentInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner,
         //
     }
 
-    DeploymentImpl(DeploymentInner inner, AppServiceManager manager) {
+    DeploymentImpl(DeploymentInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class DeploymentImpl extends CreatableUpdatableImpl<Deployment, DeploymentInner,
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorDefinitionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorDefinitionImpl.java
index bbe8e81e7c44..126cde246768 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorDefinitionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorDefinitionImpl.java
@@ -10,23 +10,19 @@
 
 import com.microsoft.azure.management.appservice.v2018_02_01.DetectorDefinition;
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
-import rx.Observable;
 
 class DetectorDefinitionImpl extends WrapperImpl<DetectorDefinitionInner> implements DetectorDefinition {
-    private final AppServiceManager manager;
-
-    DetectorDefinitionImpl(DetectorDefinitionInner inner,  AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    DetectorDefinitionImpl(DetectorDefinitionInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
-
-
     @Override
     public String description() {
         return this.inner().description();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseImpl.java
new file mode 100644
index 000000000000..3fdea30206f8
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.DetectorResponse;
+import com.microsoft.azure.arm.model.implementation.IndexableRefreshableWrapperImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticData;
+import com.microsoft.azure.management.appservice.v2018_02_01.DetectorInfo;
+
+class DetectorResponseImpl extends IndexableRefreshableWrapperImpl<DetectorResponse, DetectorResponseInner> implements DetectorResponse {
+    private final CertificateRegistrationManager manager;
+    private String resourceGroupName;
+    private String name;
+    private String detectorName;
+
+    DetectorResponseImpl(DetectorResponseInner inner,  CertificateRegistrationManager manager) {
+        super(null, inner);
+        this.manager = manager;
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.name = IdParsingUtils.getValueFromIdByName(inner.id(), "hostingEnvironments");
+        this.detectorName = IdParsingUtils.getValueFromIdByName(inner.id(), "detectors");
+    }
+
+    @Override
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    protected Observable<DetectorResponseInner> getInnerAsync() {
+        DiagnosticsInner client = this.manager().inner().diagnostics();
+        return client.getHostingEnvironmentDetectorResponseAsync(this.resourceGroupName, this.name, this.detectorName);
+    }
+
+
+
+    @Override
+    public List<DiagnosticData> dataset() {
+        return this.inner().dataset();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public DetectorInfo metadata() {
+        return this.inner().metadata();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseInner.java
new file mode 100644
index 000000000000..1cf23fd1c030
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DetectorResponseInner.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.DetectorInfo;
+import java.util.List;
+import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticData;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.management.appservice.v2018_02_01.ProxyOnlyResource;
+
+/**
+ * Class representing Response from Detector.
+ */
+@JsonFlatten
+public class DetectorResponseInner extends ProxyOnlyResource {
+    /**
+     * metadata for the detector.
+     */
+    @JsonProperty(value = "properties.metadata")
+    private DetectorInfo metadata;
+
+    /**
+     * Data Set.
+     */
+    @JsonProperty(value = "properties.dataset")
+    private List<DiagnosticData> dataset;
+
+    /**
+     * Get metadata for the detector.
+     *
+     * @return the metadata value
+     */
+    public DetectorInfo metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Set metadata for the detector.
+     *
+     * @param metadata the metadata value to set
+     * @return the DetectorResponseInner object itself.
+     */
+    public DetectorResponseInner withMetadata(DetectorInfo metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get data Set.
+     *
+     * @return the dataset value
+     */
+    public List<DiagnosticData> dataset() {
+        return this.dataset;
+    }
+
+    /**
+     * Set data Set.
+     *
+     * @param dataset the dataset value to set
+     * @return the DetectorResponseInner object itself.
+     */
+    public DetectorResponseInner withDataset(List<DiagnosticData> dataset) {
+        this.dataset = dataset;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticAnalysisImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticAnalysisImpl.java
index e0a7f5abc3a1..623fa7cebbe3 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticAnalysisImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticAnalysisImpl.java
@@ -19,13 +19,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.AnalysisData;
 
 class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticAnalysis, DiagnosticAnalysisInner> implements DiagnosticAnalysis {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
     private String analysisName;
 
-    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  AppServiceManager manager) {
+    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -35,7 +35,7 @@ class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticA
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticCategoryImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticCategoryImpl.java
index 946e2f6c4371..b1bcbe4ef8c0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticCategoryImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticCategoryImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticCategory, DiagnosticCategoryInner> implements DiagnosticCategory {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
 
-    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  AppServiceManager manager) {
+    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -27,7 +27,7 @@ class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticC
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticDetectorResponseImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticDetectorResponseImpl.java
index d748ef3051fb..16ba342a6195 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticDetectorResponseImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticDetectorResponseImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ResponseMetaData;
 
 class DiagnosticDetectorResponseImpl extends WrapperImpl<DiagnosticDetectorResponseInner> implements DiagnosticDetectorResponse {
-    private final AppServiceManager manager;
-    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsImpl.java
index 5f362726ec53..7cd1a29b89e2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsImpl.java
@@ -15,20 +15,21 @@
 import rx.functions.Func1;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticCategory;
-import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticAnalysis;
-import com.microsoft.azure.management.appservice.v2018_02_01.AnalysisDefinition;
+import com.microsoft.azure.management.appservice.v2018_02_01.DetectorResponse;
 import com.microsoft.azure.management.appservice.v2018_02_01.DetectorDefinition;
 import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticDetectorResponse;
+import com.microsoft.azure.management.appservice.v2018_02_01.DiagnosticAnalysis;
+import com.microsoft.azure.management.appservice.v2018_02_01.AnalysisDefinition;
 
 class DiagnosticsImpl extends WrapperImpl<DiagnosticsInner> implements Diagnostics {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    DiagnosticsImpl(AppServiceManager manager) {
+    DiagnosticsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().diagnostics());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -96,12 +97,20 @@ public DiagnosticCategory call(DiagnosticCategoryInner inner) {
        });
     }
 
+    private DetectorResponseImpl wrapDetectorResponseModel(DetectorResponseInner inner) {
+        return  new DetectorResponseImpl(inner, manager());
+    }
+
     private DiagnosticAnalysisImpl wrapDiagnosticAnalysisModel(DiagnosticAnalysisInner inner) {
         return  new DiagnosticAnalysisImpl(inner, manager());
     }
 
-    private DetectorDefinitionImpl wrapDetectorDefinitionModel(DetectorDefinitionInner inner) {
-        return  new DetectorDefinitionImpl(inner, manager());
+    private Observable<DetectorResponseInner> getDetectorResponseInnerUsingDiagnosticsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String name = IdParsingUtils.getValueFromIdByName(id, "hostingEnvironments");
+        String detectorName = IdParsingUtils.getValueFromIdByName(id, "detectors");
+        DiagnosticsInner client = this.inner();
+        return client.getHostingEnvironmentDetectorResponseAsync(resourceGroupName, name, detectorName);
     }
 
     private Observable<DiagnosticAnalysisInner> getDiagnosticAnalysisInnerUsingDiagnosticsInnerAsync(String id) {
@@ -114,91 +123,61 @@ private Observable<DiagnosticAnalysisInner> getDiagnosticAnalysisInnerUsingDiagn
     }
 
     @Override
-    public Observable<DiagnosticAnalysis> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+    public Observable<DetectorResponse> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName) {
         DiagnosticsInner client = this.inner();
-        return client.getSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName)
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+        return client.getHostingEnvironmentDetectorResponseAsync(resourceGroupName, name, detectorName)
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
             @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return wrapDiagnosticAnalysisModel(inner);
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return wrapDetectorResponseModel(inner);
             }
        });
     }
 
     @Override
-    public Observable<DiagnosticAnalysis> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+    public Observable<DetectorResponse> listHostingEnvironmentDetectorResponsesAsync(final String resourceGroupName, final String name) {
         DiagnosticsInner client = this.inner();
-        return client.listSiteAnalysesAsync(resourceGroupName, siteName, diagnosticCategory)
-        .flatMapIterable(new Func1<Page<AnalysisDefinitionInner>, Iterable<AnalysisDefinitionInner>>() {
+        return client.listHostingEnvironmentDetectorResponsesAsync(resourceGroupName, name)
+        .flatMapIterable(new Func1<Page<DetectorResponseInner>, Iterable<DetectorResponseInner>>() {
             @Override
-            public Iterable<AnalysisDefinitionInner> call(Page<AnalysisDefinitionInner> page) {
+            public Iterable<DetectorResponseInner> call(Page<DetectorResponseInner> page) {
                 return page.items();
             }
         })
-        .flatMap(new Func1<AnalysisDefinitionInner, Observable<DiagnosticAnalysisInner>>() {
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
             @Override
-            public Observable<DiagnosticAnalysisInner> call(AnalysisDefinitionInner inner) {
-                return getDiagnosticAnalysisInnerUsingDiagnosticsInnerAsync(inner.id());
-            }
-        })
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
-            @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return wrapDiagnosticAnalysisModel(inner);
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return wrapDetectorResponseModel(inner);
             }
         });
     }
 
     @Override
-    public Observable<DiagnosticAnalysis> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+    public Observable<DetectorResponse> listSiteDetectorResponsesAsync(final String resourceGroupName, final String siteName) {
         DiagnosticsInner client = this.inner();
-        return client.executeSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName)
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+        return client.listSiteDetectorResponsesAsync(resourceGroupName, siteName)
+        .flatMapIterable(new Func1<Page<DetectorResponseInner>, Iterable<DetectorResponseInner>>() {
             @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return new DiagnosticAnalysisImpl(inner, manager());
-            }
-        });
-    }
-
-    @Override
-    public Observable<AnalysisDefinition> listSiteAnalysesSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot) {
-        DiagnosticsInner client = this.inner();
-        return client.listSiteAnalysesSlotAsync(resourceGroupName, siteName, diagnosticCategory, slot)
-        .flatMapIterable(new Func1<Page<AnalysisDefinitionInner>, Iterable<AnalysisDefinitionInner>>() {
-            @Override
-            public Iterable<AnalysisDefinitionInner> call(Page<AnalysisDefinitionInner> page) {
+            public Iterable<DetectorResponseInner> call(Page<DetectorResponseInner> page) {
                 return page.items();
             }
         })
-        .map(new Func1<AnalysisDefinitionInner, AnalysisDefinition>() {
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
             @Override
-            public AnalysisDefinition call(AnalysisDefinitionInner inner) {
-                return new AnalysisDefinitionImpl(inner, manager());
-            }
-        });
-    }
-
-    @Override
-    public Observable<DiagnosticAnalysis> getSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot) {
-        DiagnosticsInner client = this.inner();
-        return client.getSiteAnalysisSlotAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot)
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
-            @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return new DiagnosticAnalysisImpl(inner, manager());
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return new DetectorResponseImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<DiagnosticAnalysis> executeSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot) {
+    public Observable<DetectorResponse> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName) {
         DiagnosticsInner client = this.inner();
-        return client.executeSiteAnalysisSlotAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot)
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+        return client.getSiteDetectorResponseAsync(resourceGroupName, siteName, detectorName)
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
             @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return new DiagnosticAnalysisImpl(inner, manager());
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return new DetectorResponseImpl(inner, manager());
             }
         });
     }
@@ -216,7 +195,7 @@ public Iterable<DetectorDefinitionInner> call(Page<DetectorDefinitionInner> page
         .map(new Func1<DetectorDefinitionInner, DetectorDefinition>() {
             @Override
             public DetectorDefinition call(DetectorDefinitionInner inner) {
-                return wrapDetectorDefinitionModel(inner);
+                return new DetectorDefinitionImpl(inner, manager());
             }
         });
     }
@@ -251,6 +230,36 @@ public DiagnosticDetectorResponse call(DiagnosticDetectorResponseInner inner) {
         });
     }
 
+    @Override
+    public Observable<DetectorResponse> listSiteDetectorResponsesSlotAsync(final String resourceGroupName, final String siteName, final String slot) {
+        DiagnosticsInner client = this.inner();
+        return client.listSiteDetectorResponsesSlotAsync(resourceGroupName, siteName, slot)
+        .flatMapIterable(new Func1<Page<DetectorResponseInner>, Iterable<DetectorResponseInner>>() {
+            @Override
+            public Iterable<DetectorResponseInner> call(Page<DetectorResponseInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
+            @Override
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return new DetectorResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<DetectorResponse> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot) {
+        DiagnosticsInner client = this.inner();
+        return client.getSiteDetectorResponseSlotAsync(resourceGroupName, siteName, detectorName, slot)
+        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
+            @Override
+            public DetectorResponse call(DetectorResponseInner inner) {
+                return new DetectorResponseImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<DetectorDefinition> listSiteDetectorsSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot) {
         DiagnosticsInner client = this.inner();
@@ -299,4 +308,94 @@ public DiagnosticDetectorResponse call(DiagnosticDetectorResponseInner inner) {
         });
     }
 
+    @Override
+    public Observable<DiagnosticAnalysis> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        DiagnosticsInner client = this.inner();
+        return client.getSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName)
+        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+            @Override
+            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
+                return wrapDiagnosticAnalysisModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Observable<DiagnosticAnalysis> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        DiagnosticsInner client = this.inner();
+        return client.listSiteAnalysesAsync(resourceGroupName, siteName, diagnosticCategory)
+        .flatMapIterable(new Func1<Page<AnalysisDefinitionInner>, Iterable<AnalysisDefinitionInner>>() {
+            @Override
+            public Iterable<AnalysisDefinitionInner> call(Page<AnalysisDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .flatMap(new Func1<AnalysisDefinitionInner, Observable<DiagnosticAnalysisInner>>() {
+            @Override
+            public Observable<DiagnosticAnalysisInner> call(AnalysisDefinitionInner inner) {
+                return getDiagnosticAnalysisInnerUsingDiagnosticsInnerAsync(inner.id());
+            }
+        })
+        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+            @Override
+            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
+                return wrapDiagnosticAnalysisModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<DiagnosticAnalysis> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        DiagnosticsInner client = this.inner();
+        return client.executeSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName)
+        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+            @Override
+            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
+                return new DiagnosticAnalysisImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AnalysisDefinition> listSiteAnalysesSlotAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String slot) {
+        DiagnosticsInner client = this.inner();
+        return client.listSiteAnalysesSlotAsync(resourceGroupName, siteName, diagnosticCategory, slot)
+        .flatMapIterable(new Func1<Page<AnalysisDefinitionInner>, Iterable<AnalysisDefinitionInner>>() {
+            @Override
+            public Iterable<AnalysisDefinitionInner> call(Page<AnalysisDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AnalysisDefinitionInner, AnalysisDefinition>() {
+            @Override
+            public AnalysisDefinition call(AnalysisDefinitionInner inner) {
+                return new AnalysisDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<DiagnosticAnalysis> getSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot) {
+        DiagnosticsInner client = this.inner();
+        return client.getSiteAnalysisSlotAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot)
+        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+            @Override
+            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
+                return new DiagnosticAnalysisImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<DiagnosticAnalysis> executeSiteAnalysisSlotAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, String slot) {
+        DiagnosticsInner client = this.inner();
+        return client.executeSiteAnalysisSlotAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot)
+        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
+            @Override
+            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
+                return new DiagnosticAnalysisImpl(inner, manager());
+            }
+        });
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsInner.java
index 2a724b3655d0..04c9bd660281 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DiagnosticsInner.java
@@ -59,6 +59,22 @@ public DiagnosticsInner(Retrofit retrofit, WebSiteManagementClientImpl client) {
      * used by Retrofit to perform actually REST calls.
      */
     interface DiagnosticsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listHostingEnvironmentDetectorResponses" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors")
+        Observable<Response<ResponseBody>> listHostingEnvironmentDetectorResponses(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics getHostingEnvironmentDetectorResponse" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/detectors/{detectorName}")
+        Observable<Response<ResponseBody>> getHostingEnvironmentDetectorResponse(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("detectorName") String detectorName, @Path("subscriptionId") String subscriptionId, @Query("startTime") DateTime startTime, @Query("endTime") DateTime endTime, @Query("timeGrain") String timeGrain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDetectorResponses" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors")
+        Observable<Response<ResponseBody>> listSiteDetectorResponses(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics getSiteDetectorResponse" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/detectors/{detectorName}")
+        Observable<Response<ResponseBody>> getSiteDetectorResponse(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("detectorName") String detectorName, @Path("subscriptionId") String subscriptionId, @Query("startTime") DateTime startTime, @Query("endTime") DateTime endTime, @Query("timeGrain") String timeGrain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDiagnosticCategories" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/diagnostics")
         Observable<Response<ResponseBody>> listSiteDiagnosticCategories(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -91,6 +107,14 @@ interface DiagnosticsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/diagnostics/{diagnosticCategory}/detectors/{detectorName}/execute")
         Observable<Response<ResponseBody>> executeSiteDetector(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("detectorName") String detectorName, @Path("diagnosticCategory") String diagnosticCategory, @Path("subscriptionId") String subscriptionId, @Query("startTime") DateTime startTime, @Query("endTime") DateTime endTime, @Query("timeGrain") String timeGrain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDetectorResponsesSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors")
+        Observable<Response<ResponseBody>> listSiteDetectorResponsesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics getSiteDetectorResponseSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/detectors/{detectorName}")
+        Observable<Response<ResponseBody>> getSiteDetectorResponseSlot(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("detectorName") String detectorName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("startTime") DateTime startTime, @Query("endTime") DateTime endTime, @Query("timeGrain") String timeGrain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDiagnosticCategoriesSlot" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/diagnostics")
         Observable<Response<ResponseBody>> listSiteDiagnosticCategoriesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -123,6 +147,14 @@ interface DiagnosticsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slot}/diagnostics/{diagnosticCategory}/detectors/{detectorName}/execute")
         Observable<Response<ResponseBody>> executeSiteDetectorSlot(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("detectorName") String detectorName, @Path("diagnosticCategory") String diagnosticCategory, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("startTime") DateTime startTime, @Query("endTime") DateTime endTime, @Query("timeGrain") String timeGrain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listHostingEnvironmentDetectorResponsesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listHostingEnvironmentDetectorResponsesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDetectorResponsesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listSiteDetectorResponsesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDiagnosticCategoriesNext" })
         @GET
         Observable<Response<ResponseBody>> listSiteDiagnosticCategoriesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -139,6 +171,10 @@ interface DiagnosticsService {
         @GET
         Observable<Response<ResponseBody>> getSiteDetectorNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDetectorResponsesSlotNext" })
+        @GET
+        Observable<Response<ResponseBody>> listSiteDetectorResponsesSlotNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.Diagnostics listSiteDiagnosticCategoriesSlotNext" })
         @GET
         Observable<Response<ResponseBody>> listSiteDiagnosticCategoriesSlotNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -158,105 +194,105 @@ interface DiagnosticsService {
     }
 
     /**
-     * Get Diagnostics Categories.
-     * Get Diagnostics Categories.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
+     * @param name Site Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PagedList&lt;DiagnosticCategoryInner&gt; object if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
      */
-    public PagedList<DiagnosticCategoryInner> listSiteDiagnosticCategories(final String resourceGroupName, final String siteName) {
-        ServiceResponse<Page<DiagnosticCategoryInner>> response = listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName).toBlocking().single();
-        return new PagedList<DiagnosticCategoryInner>(response.body()) {
+    public PagedList<DetectorResponseInner> listHostingEnvironmentDetectorResponses(final String resourceGroupName, final String name) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listHostingEnvironmentDetectorResponsesSinglePageAsync(resourceGroupName, name).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
             @Override
-            public Page<DiagnosticCategoryInner> nextPage(String nextPageLink) {
-                return listSiteDiagnosticCategoriesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
 
     /**
-     * Get Diagnostics Categories.
-     * Get Diagnostics Categories.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
+     * @param name Site Name
      * @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<List<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesAsync(final String resourceGroupName, final String siteName, final ListOperationCallback<DiagnosticCategoryInner> serviceCallback) {
+    public ServiceFuture<List<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesAsync(final String resourceGroupName, final String name, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName),
-            new Func1<String, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+            listHostingEnvironmentDetectorResponsesSinglePageAsync(resourceGroupName, name),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(String nextPageLink) {
-                    return listSiteDiagnosticCategoriesNextSinglePageAsync(nextPageLink);
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
     }
 
     /**
-     * Get Diagnostics Categories.
-     * Get Diagnostics Categories.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
+     * @param name Site Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DiagnosticCategoryInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<Page<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesAsync(final String resourceGroupName, final String siteName) {
-        return listSiteDiagnosticCategoriesWithServiceResponseAsync(resourceGroupName, siteName)
-            .map(new Func1<ServiceResponse<Page<DiagnosticCategoryInner>>, Page<DiagnosticCategoryInner>>() {
+    public Observable<Page<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesAsync(final String resourceGroupName, final String name) {
+        return listHostingEnvironmentDetectorResponsesWithServiceResponseAsync(resourceGroupName, name)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
                 @Override
-                public Page<DiagnosticCategoryInner> call(ServiceResponse<Page<DiagnosticCategoryInner>> response) {
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
                     return response.body();
                 }
             });
     }
 
     /**
-     * Get Diagnostics Categories.
-     * Get Diagnostics Categories.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
+     * @param name Site Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DiagnosticCategoryInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> listSiteDiagnosticCategoriesWithServiceResponseAsync(final String resourceGroupName, final String siteName) {
-        return listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName)
-            .concatMap(new Func1<ServiceResponse<Page<DiagnosticCategoryInner>>, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listHostingEnvironmentDetectorResponsesWithServiceResponseAsync(final String resourceGroupName, final String name) {
+        return listHostingEnvironmentDetectorResponsesSinglePageAsync(resourceGroupName, name)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(ServiceResponse<Page<DiagnosticCategoryInner>> page) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
                     String nextPageLink = page.body().nextPageLink();
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listSiteDiagnosticCategoriesNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listHostingEnvironmentDetectorResponsesNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
 
     /**
-     * Get Diagnostics Categories.
-     * Get Diagnostics Categories.
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
      *
-    ServiceResponse<PageImpl<DiagnosticCategoryInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
-    ServiceResponse<PageImpl<DiagnosticCategoryInner>> * @param siteName Site Name
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param name Site Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the PagedList&lt;DiagnosticCategoryInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> listSiteDiagnosticCategoriesSinglePageAsync(final String resourceGroupName, final String siteName) {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listHostingEnvironmentDetectorResponsesSinglePageAsync(final String resourceGroupName, final String name) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
-        if (siteName == null) {
-            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -264,13 +300,13 @@ public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> listSiteDiagno
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listSiteDiagnosticCategories(resourceGroupName, siteName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+        return service.listHostingEnvironmentDetectorResponses(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<DiagnosticCategoryInner>> result = listSiteDiagnosticCategoriesDelegate(response);
-                        return Observable.just(new ServiceResponse<Page<DiagnosticCategoryInner>>(result.body(), result.response()));
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listHostingEnvironmentDetectorResponsesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -278,82 +314,82 @@ public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<DiagnosticCategoryInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<DiagnosticCategoryInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Get Diagnostics Category.
-     * Get Diagnostics Category.
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticCategoryInner object if successful.
+     * @return the DetectorResponseInner object if successful.
      */
-    public DiagnosticCategoryInner getSiteDiagnosticCategory(String resourceGroupName, String siteName, String diagnosticCategory) {
-        return getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single().body();
+    public DetectorResponseInner getHostingEnvironmentDetectorResponse(String resourceGroupName, String name, String detectorName) {
+        return getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName).toBlocking().single().body();
     }
 
     /**
-     * Get Diagnostics Category.
-     * Get Diagnostics Category.
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
      * @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<DiagnosticCategoryInner> getSiteDiagnosticCategoryAsync(String resourceGroupName, String siteName, String diagnosticCategory, final ServiceCallback<DiagnosticCategoryInner> serviceCallback) {
-        return ServiceFuture.fromResponse(getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory), serviceCallback);
+    public ServiceFuture<DetectorResponseInner> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName), serviceCallback);
     }
 
     /**
-     * Get Diagnostics Category.
-     * Get Diagnostics Category.
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticCategoryInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<DiagnosticCategoryInner> getSiteDiagnosticCategoryAsync(String resourceGroupName, String siteName, String diagnosticCategory) {
-        return getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory).map(new Func1<ServiceResponse<DiagnosticCategoryInner>, DiagnosticCategoryInner>() {
+    public Observable<DetectorResponseInner> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName) {
+        return getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
             @Override
-            public DiagnosticCategoryInner call(ServiceResponse<DiagnosticCategoryInner> response) {
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Get Diagnostics Category.
-     * Get Diagnostics Category.
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticCategoryInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<ServiceResponse<DiagnosticCategoryInner>> getSiteDiagnosticCategoryWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory) {
+    public Observable<ServiceResponse<DetectorResponseInner>> getHostingEnvironmentDetectorResponseWithServiceResponseAsync(String resourceGroupName, String name, String detectorName) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
-        if (siteName == null) {
-            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
         }
-        if (diagnosticCategory == null) {
-            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -361,12 +397,15 @@ public Observable<ServiceResponse<DiagnosticCategoryInner>> getSiteDiagnosticCat
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.getSiteDiagnosticCategory(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticCategoryInner>>>() {
+        final DateTime startTime = null;
+        final DateTime endTime = null;
+        final String timeGrain = null;
+        return service.getHostingEnvironmentDetectorResponse(resourceGroupName, name, detectorName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticCategoryInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticCategoryInner> clientResponse = getSiteDiagnosticCategoryDelegate(response);
+                        ServiceResponse<DetectorResponseInner> clientResponse = getHostingEnvironmentDetectorResponseDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -375,135 +414,229 @@ public Observable<ServiceResponse<DiagnosticCategoryInner>> call(Response<Respon
             });
     }
 
-    private ServiceResponse<DiagnosticCategoryInner> getSiteDiagnosticCategoryDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<DiagnosticCategoryInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<DiagnosticCategoryInner>() { }.getType())
+    /**
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DetectorResponseInner object if successful.
+     */
+    public DetectorResponseInner getHostingEnvironmentDetectorResponse(String resourceGroupName, String name, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName, startTime, endTime, timeGrain).toBlocking().single().body();
+    }
+
+    /**
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @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<DetectorResponseInner> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName, startTime, endTime, timeGrain), serviceCallback);
+    }
+
+    /**
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DetectorResponseInner object
+     */
+    public Observable<DetectorResponseInner> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getHostingEnvironmentDetectorResponseWithServiceResponseAsync(resourceGroupName, name, detectorName, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
+            @Override
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get Hosting Environment Detector Response.
+     * Get Hosting Environment Detector Response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name App Service Environment Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DetectorResponseInner object
+     */
+    public Observable<ServiceResponse<DetectorResponseInner>> getHostingEnvironmentDetectorResponseWithServiceResponseAsync(String resourceGroupName, String name, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getHostingEnvironmentDetectorResponse(resourceGroupName, name, detectorName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DetectorResponseInner> clientResponse = getHostingEnvironmentDetectorResponseDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DetectorResponseInner> getHostingEnvironmentDetectorResponseDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DetectorResponseInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DetectorResponseInner>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PagedList&lt;AnalysisDefinitionInner&gt; object if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
      */
-    public PagedList<AnalysisDefinitionInner> listSiteAnalyses(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        ServiceResponse<Page<AnalysisDefinitionInner>> response = listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single();
-        return new PagedList<AnalysisDefinitionInner>(response.body()) {
+    public PagedList<DetectorResponseInner> listSiteDetectorResponses(final String resourceGroupName, final String siteName) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listSiteDetectorResponsesSinglePageAsync(resourceGroupName, siteName).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
             @Override
-            public Page<AnalysisDefinitionInner> nextPage(String nextPageLink) {
-                return listSiteAnalysesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listSiteDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
      * @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<List<AnalysisDefinitionInner>> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final ListOperationCallback<AnalysisDefinitionInner> serviceCallback) {
+    public ServiceFuture<List<DetectorResponseInner>> listSiteDetectorResponsesAsync(final String resourceGroupName, final String siteName, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory),
-            new Func1<String, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+            listSiteDetectorResponsesSinglePageAsync(resourceGroupName, siteName),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(String nextPageLink) {
-                    return listSiteAnalysesNextSinglePageAsync(nextPageLink);
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listSiteDetectorResponsesNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
     }
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;AnalysisDefinitionInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<Page<AnalysisDefinitionInner>> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        return listSiteAnalysesWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory)
-            .map(new Func1<ServiceResponse<Page<AnalysisDefinitionInner>>, Page<AnalysisDefinitionInner>>() {
+    public Observable<Page<DetectorResponseInner>> listSiteDetectorResponsesAsync(final String resourceGroupName, final String siteName) {
+        return listSiteDetectorResponsesWithServiceResponseAsync(resourceGroupName, siteName)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
                 @Override
-                public Page<AnalysisDefinitionInner> call(ServiceResponse<Page<AnalysisDefinitionInner>> response) {
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
                     return response.body();
                 }
             });
     }
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;AnalysisDefinitionInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> listSiteAnalysesWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        return listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory)
-            .concatMap(new Func1<ServiceResponse<Page<AnalysisDefinitionInner>>, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesWithServiceResponseAsync(final String resourceGroupName, final String siteName) {
+        return listSiteDetectorResponsesSinglePageAsync(resourceGroupName, siteName)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(ServiceResponse<Page<AnalysisDefinitionInner>> page) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
                     String nextPageLink = page.body().nextPageLink();
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(listSiteAnalysesNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listSiteDetectorResponsesNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
 
     /**
-     * Get Site Analyses.
-     * Get Site Analyses.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
-    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
-    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param siteName Site Name
-    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param diagnosticCategory Diagnostic Category
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param siteName Site Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the PagedList&lt;AnalysisDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> listSiteAnalysesSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesSinglePageAsync(final String resourceGroupName, final String siteName) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
         if (siteName == null) {
             throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
         }
-        if (diagnosticCategory == null) {
-            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
-        }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listSiteAnalyses(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+        return service.listSiteDetectorResponses(resourceGroupName, siteName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<AnalysisDefinitionInner>> result = listSiteAnalysesDelegate(response);
-                        return Observable.just(new ServiceResponse<Page<AnalysisDefinitionInner>>(result.body(), result.response()));
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listSiteDetectorResponsesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -511,58 +644,621 @@ public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<AnalysisDefinitionInner>> listSiteAnalysesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<AnalysisDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<AnalysisDefinitionInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listSiteDetectorResponsesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticAnalysisInner object if successful.
+     * @return the DetectorResponseInner object if successful.
      */
-    public DiagnosticAnalysisInner getSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
-        return getSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).toBlocking().single().body();
+    public DetectorResponseInner getSiteDetectorResponse(String resourceGroupName, String siteName, String detectorName) {
+        return getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName).toBlocking().single().body();
     }
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
+     * @param detectorName Detector Resource Name
      * @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<DiagnosticAnalysisInner> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
-        return ServiceFuture.fromResponse(getSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName), serviceCallback);
+    public ServiceFuture<DetectorResponseInner> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName), serviceCallback);
     }
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
+     * @param detectorName Detector Resource Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<DiagnosticAnalysisInner> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+    public Observable<DetectorResponseInner> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName) {
+        return getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
+            @Override
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DetectorResponseInner object
+     */
+    public Observable<ServiceResponse<DetectorResponseInner>> getSiteDetectorResponseWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startTime = null;
+        final DateTime endTime = null;
+        final String timeGrain = null;
+        return service.getSiteDetectorResponse(resourceGroupName, siteName, detectorName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DetectorResponseInner> clientResponse = getSiteDetectorResponseDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DetectorResponseInner object if successful.
+     */
+    public DetectorResponseInner getSiteDetectorResponse(String resourceGroupName, String siteName, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName, startTime, endTime, timeGrain).toBlocking().single().body();
+    }
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @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<DetectorResponseInner> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName, startTime, endTime, timeGrain), serviceCallback);
+    }
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DetectorResponseInner object
+     */
+    public Observable<DetectorResponseInner> getSiteDetectorResponseAsync(String resourceGroupName, String siteName, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getSiteDetectorResponseWithServiceResponseAsync(resourceGroupName, siteName, detectorName, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
+            @Override
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get site detector response.
+     * Get site detector response.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param detectorName Detector Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DetectorResponseInner object
+     */
+    public Observable<ServiceResponse<DetectorResponseInner>> getSiteDetectorResponseWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, DateTime startTime, DateTime endTime, String timeGrain) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSiteDetectorResponse(resourceGroupName, siteName, detectorName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DetectorResponseInner> clientResponse = getSiteDetectorResponseDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DetectorResponseInner> getSiteDetectorResponseDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DetectorResponseInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DetectorResponseInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get Diagnostics Categories.
+     * Get Diagnostics Categories.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;DiagnosticCategoryInner&gt; object if successful.
+     */
+    public PagedList<DiagnosticCategoryInner> listSiteDiagnosticCategories(final String resourceGroupName, final String siteName) {
+        ServiceResponse<Page<DiagnosticCategoryInner>> response = listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName).toBlocking().single();
+        return new PagedList<DiagnosticCategoryInner>(response.body()) {
+            @Override
+            public Page<DiagnosticCategoryInner> nextPage(String nextPageLink) {
+                return listSiteDiagnosticCategoriesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get Diagnostics Categories.
+     * Get Diagnostics Categories.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @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<List<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesAsync(final String resourceGroupName, final String siteName, final ListOperationCallback<DiagnosticCategoryInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName),
+            new Func1<String, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(String nextPageLink) {
+                    return listSiteDiagnosticCategoriesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get Diagnostics Categories.
+     * Get Diagnostics Categories.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DiagnosticCategoryInner&gt; object
+     */
+    public Observable<Page<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesAsync(final String resourceGroupName, final String siteName) {
+        return listSiteDiagnosticCategoriesWithServiceResponseAsync(resourceGroupName, siteName)
+            .map(new Func1<ServiceResponse<Page<DiagnosticCategoryInner>>, Page<DiagnosticCategoryInner>>() {
+                @Override
+                public Page<DiagnosticCategoryInner> call(ServiceResponse<Page<DiagnosticCategoryInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get Diagnostics Categories.
+     * Get Diagnostics Categories.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DiagnosticCategoryInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> listSiteDiagnosticCategoriesWithServiceResponseAsync(final String resourceGroupName, final String siteName) {
+        return listSiteDiagnosticCategoriesSinglePageAsync(resourceGroupName, siteName)
+            .concatMap(new Func1<ServiceResponse<Page<DiagnosticCategoryInner>>, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(ServiceResponse<Page<DiagnosticCategoryInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSiteDiagnosticCategoriesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get Diagnostics Categories.
+     * Get Diagnostics Categories.
+     *
+    ServiceResponse<PageImpl<DiagnosticCategoryInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DiagnosticCategoryInner>> * @param siteName Site Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DiagnosticCategoryInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> listSiteDiagnosticCategoriesSinglePageAsync(final String resourceGroupName, final String siteName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listSiteDiagnosticCategories(resourceGroupName, siteName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DiagnosticCategoryInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DiagnosticCategoryInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DiagnosticCategoryInner>> result = listSiteDiagnosticCategoriesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DiagnosticCategoryInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DiagnosticCategoryInner>> listSiteDiagnosticCategoriesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DiagnosticCategoryInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DiagnosticCategoryInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get Diagnostics Category.
+     * Get Diagnostics Category.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DiagnosticCategoryInner object if successful.
+     */
+    public DiagnosticCategoryInner getSiteDiagnosticCategory(String resourceGroupName, String siteName, String diagnosticCategory) {
+        return getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single().body();
+    }
+
+    /**
+     * Get Diagnostics Category.
+     * Get Diagnostics Category.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @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<DiagnosticCategoryInner> getSiteDiagnosticCategoryAsync(String resourceGroupName, String siteName, String diagnosticCategory, final ServiceCallback<DiagnosticCategoryInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory), serviceCallback);
+    }
+
+    /**
+     * Get Diagnostics Category.
+     * Get Diagnostics Category.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticCategoryInner object
+     */
+    public Observable<DiagnosticCategoryInner> getSiteDiagnosticCategoryAsync(String resourceGroupName, String siteName, String diagnosticCategory) {
+        return getSiteDiagnosticCategoryWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory).map(new Func1<ServiceResponse<DiagnosticCategoryInner>, DiagnosticCategoryInner>() {
+            @Override
+            public DiagnosticCategoryInner call(ServiceResponse<DiagnosticCategoryInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get Diagnostics Category.
+     * Get Diagnostics Category.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticCategoryInner object
+     */
+    public Observable<ServiceResponse<DiagnosticCategoryInner>> getSiteDiagnosticCategoryWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (diagnosticCategory == null) {
+            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSiteDiagnosticCategory(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticCategoryInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DiagnosticCategoryInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DiagnosticCategoryInner> clientResponse = getSiteDiagnosticCategoryDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DiagnosticCategoryInner> getSiteDiagnosticCategoryDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DiagnosticCategoryInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DiagnosticCategoryInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;AnalysisDefinitionInner&gt; object if successful.
+     */
+    public PagedList<AnalysisDefinitionInner> listSiteAnalyses(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        ServiceResponse<Page<AnalysisDefinitionInner>> response = listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single();
+        return new PagedList<AnalysisDefinitionInner>(response.body()) {
+            @Override
+            public Page<AnalysisDefinitionInner> nextPage(String nextPageLink) {
+                return listSiteAnalysesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @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<List<AnalysisDefinitionInner>> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final ListOperationCallback<AnalysisDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory),
+            new Func1<String, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(String nextPageLink) {
+                    return listSiteAnalysesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AnalysisDefinitionInner&gt; object
+     */
+    public Observable<Page<AnalysisDefinitionInner>> listSiteAnalysesAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        return listSiteAnalysesWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory)
+            .map(new Func1<ServiceResponse<Page<AnalysisDefinitionInner>>, Page<AnalysisDefinitionInner>>() {
+                @Override
+                public Page<AnalysisDefinitionInner> call(ServiceResponse<Page<AnalysisDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AnalysisDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> listSiteAnalysesWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        return listSiteAnalysesSinglePageAsync(resourceGroupName, siteName, diagnosticCategory)
+            .concatMap(new Func1<ServiceResponse<Page<AnalysisDefinitionInner>>, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(ServiceResponse<Page<AnalysisDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSiteAnalysesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get Site Analyses.
+     * Get Site Analyses.
+     *
+    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param siteName Site Name
+    ServiceResponse<PageImpl<AnalysisDefinitionInner>> * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AnalysisDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> listSiteAnalysesSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (diagnosticCategory == null) {
+            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listSiteAnalyses(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AnalysisDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AnalysisDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AnalysisDefinitionInner>> result = listSiteAnalysesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AnalysisDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AnalysisDefinitionInner>> listSiteAnalysesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AnalysisDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AnalysisDefinitionInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get Site Analysis.
+     * Get Site Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param analysisName Analysis Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DiagnosticAnalysisInner object if successful.
+     */
+    public DiagnosticAnalysisInner getSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        return getSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).toBlocking().single().body();
+    }
+
+    /**
+     * Get Site Analysis.
+     * Get Site Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param analysisName Analysis Name
+     * @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<DiagnosticAnalysisInner> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName), serviceCallback);
+    }
+
+    /**
+     * Get Site Analysis.
+     * Get Site Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param analysisName Analysis Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<DiagnosticAnalysisInner> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
         return getSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).map(new Func1<ServiceResponse<DiagnosticAnalysisInner>, DiagnosticAnalysisInner>() {
             @Override
             public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> response) {
@@ -572,17 +1268,372 @@ public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> res
     }
 
     /**
-     * Get Site Analysis.
-     * Get Site Analysis.
+     * Get Site Analysis.
+     * Get Site Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param analysisName Analysis Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<ServiceResponse<DiagnosticAnalysisInner>> getSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (diagnosticCategory == null) {
+            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        }
+        if (analysisName == null) {
+            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = getSiteAnalysisDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DiagnosticAnalysisInner> getSiteAnalysisDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DiagnosticAnalysisInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DiagnosticAnalysisInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DiagnosticAnalysisInner object if successful.
+     */
+    public DiagnosticAnalysisInner executeSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).toBlocking().single().body();
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @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<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
+        return ServiceFuture.fromResponse(executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName), serviceCallback);
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).map(new Func1<ServiceResponse<DiagnosticAnalysisInner>, DiagnosticAnalysisInner>() {
+            @Override
+            public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (diagnosticCategory == null) {
+            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        }
+        if (analysisName == null) {
+            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startTime = null;
+        final DateTime endTime = null;
+        final String timeGrain = null;
+        return service.executeSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = executeSiteAnalysisDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the DiagnosticAnalysisInner object if successful.
+     */
+    public DiagnosticAnalysisInner executeSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain).toBlocking().single().body();
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @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<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
+        return ServiceFuture.fromResponse(executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain), serviceCallback);
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
+        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DiagnosticAnalysisInner>, DiagnosticAnalysisInner>() {
+            @Override
+            public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Execute Analysis.
+     * Execute Analysis.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Category Name
+     * @param analysisName Analysis Resource Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the DiagnosticAnalysisInner object
+     */
+    public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (siteName == null) {
+            throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
+        }
+        if (diagnosticCategory == null) {
+            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        }
+        if (analysisName == null) {
+            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.executeSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+                @Override
+                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = executeSiteAnalysisDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<DiagnosticAnalysisInner> executeSiteAnalysisDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DiagnosticAnalysisInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DiagnosticAnalysisInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get Detectors.
+     * Get Detectors.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;DetectorDefinitionInner&gt; object if successful.
+     */
+    public PagedList<DetectorDefinitionInner> listSiteDetectors(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        ServiceResponse<Page<DetectorDefinitionInner>> response = listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single();
+        return new PagedList<DetectorDefinitionInner>(response.body()) {
+            @Override
+            public Page<DetectorDefinitionInner> nextPage(String nextPageLink) {
+                return listSiteDetectorsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Get Detectors.
+     * Get Detectors.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @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<List<DetectorDefinitionInner>> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final ListOperationCallback<DetectorDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(String nextPageLink) {
+                    return listSiteDetectorsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Get Detectors.
+     * Get Detectors.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param diagnosticCategory Diagnostic Category
-     * @param analysisName Analysis Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
      */
-    public Observable<ServiceResponse<DiagnosticAnalysisInner>> getSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+    public Observable<Page<DetectorDefinitionInner>> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        return listSiteDetectorsWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory)
+            .map(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Page<DetectorDefinitionInner>>() {
+                @Override
+                public Page<DetectorDefinitionInner> call(ServiceResponse<Page<DetectorDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Get Detectors.
+     * Get Detectors.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param siteName Site Name
+     * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> listSiteDetectorsWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+        return listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(ServiceResponse<Page<DetectorDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSiteDetectorsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get Detectors.
+     * Get Detectors.
+     *
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param siteName Site Name
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param diagnosticCategory Diagnostic Category
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DetectorDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> listSiteDetectorsSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -592,22 +1643,19 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> getSiteAnalysisWithS
         if (diagnosticCategory == null) {
             throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
         }
-        if (analysisName == null) {
-            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
-        }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+        return service.listSiteDetectors(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = getSiteAnalysisDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl<DetectorDefinitionInner>> result = listSiteDetectorsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorDefinitionInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -615,78 +1663,118 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<Respon
             });
     }
 
-    private ServiceResponse<DiagnosticAnalysisInner> getSiteAnalysisDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<DiagnosticAnalysisInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<DiagnosticAnalysisInner>() { }.getType())
+    private ServiceResponse<PageImpl<DetectorDefinitionInner>> listSiteDetectorsDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorDefinitionInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Get Detector.
+     * Get Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticAnalysisInner object if successful.
+     * @return the PagedList&lt;DetectorDefinitionInner&gt; object if successful.
      */
-    public DiagnosticAnalysisInner executeSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
-        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).toBlocking().single().body();
+    public PagedList<DetectorDefinitionInner> getSiteDetector(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
+        ServiceResponse<Page<DetectorDefinitionInner>> response = getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName).toBlocking().single();
+        return new PagedList<DetectorDefinitionInner>(response.body()) {
+            @Override
+            public Page<DetectorDefinitionInner> nextPage(String nextPageLink) {
+                return getSiteDetectorNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Get Detector.
+     * Get Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Name
      * @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<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
-        return ServiceFuture.fromResponse(executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName), serviceCallback);
+    public ServiceFuture<List<DetectorDefinitionInner>> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName, final ListOperationCallback<DetectorDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(String nextPageLink) {
+                    return getSiteDetectorNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Get Detector.
+     * Get Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
      */
-    public Observable<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
-        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).map(new Func1<ServiceResponse<DiagnosticAnalysisInner>, DiagnosticAnalysisInner>() {
-            @Override
-            public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<DetectorDefinitionInner>> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
+        return getSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, detectorName)
+            .map(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Page<DetectorDefinitionInner>>() {
+                @Override
+                public Page<DetectorDefinitionInner> call(ServiceResponse<Page<DetectorDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Get Detector.
+     * Get Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
+     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
      */
-    public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
+    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> getSiteDetectorWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
+        return getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(ServiceResponse<Page<DetectorDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(getSiteDetectorNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Get Detector.
+     * Get Detector.
+     *
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param siteName Site Name
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param diagnosticCategory Diagnostic Category
+    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param detectorName Detector Name
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DetectorDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> getSiteDetectorSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -696,8 +1784,8 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisW
         if (diagnosticCategory == null) {
             throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
         }
-        if (analysisName == null) {
-            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -705,16 +1793,13 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisW
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        final DateTime startTime = null;
-        final DateTime endTime = null;
-        final String timeGrain = null;
-        return service.executeSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+        return service.getSiteDetector(resourceGroupName, siteName, diagnosticCategory, detectorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = executeSiteAnalysisDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl<DetectorDefinitionInner>> result = getSiteDetectorDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorDefinitionInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -722,107 +1807,105 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<Respon
             });
     }
 
+    private ServiceResponse<PageImpl<DetectorDefinitionInner>> getSiteDetectorDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorDefinitionInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
+     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
-     * @param startTime Start Time
-     * @param endTime End Time
-     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticAnalysisInner object if successful.
+     * @return the DiagnosticDetectorResponseInner object if successful.
      */
-    public DiagnosticAnalysisInner executeSiteAnalysis(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
-        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain).toBlocking().single().body();
+    public DiagnosticDetectorResponseInner executeSiteDetector(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
+        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory).toBlocking().single().body();
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
+     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
-     * @param startTime Start Time
-     * @param endTime End Time
-     * @param timeGrain Time Grain
      * @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<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DiagnosticAnalysisInner> serviceCallback) {
-        return ServiceFuture.fromResponse(executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain), serviceCallback);
+    public ServiceFuture<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, final ServiceCallback<DiagnosticDetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory), serviceCallback);
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
+     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
-     * @param startTime Start Time
-     * @param endTime End Time
-     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the DiagnosticDetectorResponseInner object
      */
-    public Observable<DiagnosticAnalysisInner> executeSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
-        return executeSiteAnalysisWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DiagnosticAnalysisInner>, DiagnosticAnalysisInner>() {
+    public Observable<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
+        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory).map(new Func1<ServiceResponse<DiagnosticDetectorResponseInner>, DiagnosticDetectorResponseInner>() {
             @Override
-            public DiagnosticAnalysisInner call(ServiceResponse<DiagnosticAnalysisInner> response) {
+            public DiagnosticDetectorResponseInner call(ServiceResponse<DiagnosticDetectorResponseInner> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Execute Analysis.
-     * Execute Analysis.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
+     * @param detectorName Detector Resource Name
      * @param diagnosticCategory Category Name
-     * @param analysisName Analysis Resource Name
-     * @param startTime Start Time
-     * @param endTime End Time
-     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticAnalysisInner object
+     * @return the observable to the DiagnosticDetectorResponseInner object
      */
-    public Observable<ServiceResponse<DiagnosticAnalysisInner>> executeSiteAnalysisWithServiceResponseAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName, DateTime startTime, DateTime endTime, String timeGrain) {
+    public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteDetectorWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
         if (siteName == null) {
             throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
         }
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        }
         if (diagnosticCategory == null) {
             throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
         }
-        if (analysisName == null) {
-            throw new IllegalArgumentException("Parameter analysisName is required and cannot be null.");
-        }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.executeSiteAnalysis(resourceGroupName, siteName, diagnosticCategory, analysisName, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticAnalysisInner>>>() {
+        final DateTime startTime = null;
+        final DateTime endTime = null;
+        final String timeGrain = null;
+        return service.executeSiteDetector(resourceGroupName, siteName, detectorName, diagnosticCategory, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticDetectorResponseInner>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticAnalysisInner> clientResponse = executeSiteAnalysisDelegate(response);
+                        ServiceResponse<DiagnosticDetectorResponseInner> clientResponse = executeSiteDetectorDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -831,119 +1914,92 @@ public Observable<ServiceResponse<DiagnosticAnalysisInner>> call(Response<Respon
             });
     }
 
-    private ServiceResponse<DiagnosticAnalysisInner> executeSiteAnalysisDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<DiagnosticAnalysisInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<DiagnosticAnalysisInner>() { }.getType())
-                .registerError(DefaultErrorResponseException.class)
-                .build(response);
-    }
-
     /**
-     * Get Detectors.
-     * Get Detectors.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Resource Name
+     * @param diagnosticCategory Category Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PagedList&lt;DetectorDefinitionInner&gt; object if successful.
+     * @return the DiagnosticDetectorResponseInner object if successful.
      */
-    public PagedList<DetectorDefinitionInner> listSiteDetectors(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        ServiceResponse<Page<DetectorDefinitionInner>> response = listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory).toBlocking().single();
-        return new PagedList<DetectorDefinitionInner>(response.body()) {
-            @Override
-            public Page<DetectorDefinitionInner> nextPage(String nextPageLink) {
-                return listSiteDetectorsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
-            }
-        };
+    public DiagnosticDetectorResponseInner executeSiteDetector(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
+        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain).toBlocking().single().body();
     }
 
     /**
-     * Get Detectors.
-     * Get Detectors.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Resource Name
+     * @param diagnosticCategory Category Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
      * @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<List<DetectorDefinitionInner>> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final ListOperationCallback<DetectorDefinitionInner> serviceCallback) {
-        return AzureServiceFuture.fromPageResponse(
-            listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory),
-            new Func1<String, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
-                @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(String nextPageLink) {
-                    return listSiteDetectorsNextSinglePageAsync(nextPageLink);
-                }
-            },
-            serviceCallback);
+    public ServiceFuture<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DiagnosticDetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain), serviceCallback);
     }
 
     /**
-     * Get Detectors.
-     * Get Detectors.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Resource Name
+     * @param diagnosticCategory Category Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
+     * @return the observable to the DiagnosticDetectorResponseInner object
      */
-    public Observable<Page<DetectorDefinitionInner>> listSiteDetectorsAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        return listSiteDetectorsWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory)
-            .map(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Page<DetectorDefinitionInner>>() {
-                @Override
-                public Page<DetectorDefinitionInner> call(ServiceResponse<Page<DetectorDefinitionInner>> response) {
-                    return response.body();
-                }
-            });
+    public Observable<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
+        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DiagnosticDetectorResponseInner>, DiagnosticDetectorResponseInner>() {
+            @Override
+            public DiagnosticDetectorResponseInner call(ServiceResponse<DiagnosticDetectorResponseInner> response) {
+                return response.body();
+            }
+        });
     }
 
     /**
-     * Get Detectors.
-     * Get Detectors.
+     * Execute Detector.
+     * Execute Detector.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
-     */
-    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> listSiteDetectorsWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
-        return listSiteDetectorsSinglePageAsync(resourceGroupName, siteName, diagnosticCategory)
-            .concatMap(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
-                @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(ServiceResponse<Page<DetectorDefinitionInner>> page) {
-                    String nextPageLink = page.body().nextPageLink();
-                    if (nextPageLink == null) {
-                        return Observable.just(page);
-                    }
-                    return Observable.just(page).concatWith(listSiteDetectorsNextWithServiceResponseAsync(nextPageLink));
-                }
-            });
-    }
-
-    /**
-     * Get Detectors.
-     * Get Detectors.
-     *
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param siteName Site Name
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param diagnosticCategory Diagnostic Category
+     * @param detectorName Detector Resource Name
+     * @param diagnosticCategory Category Name
+     * @param startTime Start Time
+     * @param endTime End Time
+     * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the PagedList&lt;DetectorDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     * @return the observable to the DiagnosticDetectorResponseInner object
      */
-    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> listSiteDetectorsSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory) {
+    public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteDetectorWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
         if (siteName == null) {
             throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
         }
+        if (detectorName == null) {
+            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        }
         if (diagnosticCategory == null) {
             throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
         }
@@ -953,13 +2009,13 @@ public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> listSiteDetect
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listSiteDetectors(resourceGroupName, siteName, diagnosticCategory, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+        return service.executeSiteDetector(resourceGroupName, siteName, detectorName, diagnosticCategory, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticDetectorResponseInner>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<DetectorDefinitionInner>> result = listSiteDetectorsDelegate(response);
-                        return Observable.just(new ServiceResponse<Page<DetectorDefinitionInner>>(result.body(), result.response()));
+                        ServiceResponse<DiagnosticDetectorResponseInner> clientResponse = executeSiteDetectorDelegate(response);
+                        return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -967,129 +2023,121 @@ public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<DetectorDefinitionInner>> listSiteDetectorsDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<DetectorDefinitionInner>>() { }.getType())
+    private ServiceResponse<DiagnosticDetectorResponseInner> executeSiteDetectorDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DiagnosticDetectorResponseInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DiagnosticDetectorResponseInner>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param detectorName Detector Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PagedList&lt;DetectorDefinitionInner&gt; object if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
      */
-    public PagedList<DetectorDefinitionInner> getSiteDetector(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
-        ServiceResponse<Page<DetectorDefinitionInner>> response = getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName).toBlocking().single();
-        return new PagedList<DetectorDefinitionInner>(response.body()) {
+    public PagedList<DetectorResponseInner> listSiteDetectorResponsesSlot(final String resourceGroupName, final String siteName, final String slot) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listSiteDetectorResponsesSlotSinglePageAsync(resourceGroupName, siteName, slot).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
             @Override
-            public Page<DetectorDefinitionInner> nextPage(String nextPageLink) {
-                return getSiteDetectorNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param detectorName Detector Name
+     * @param slot Slot Name
      * @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<List<DetectorDefinitionInner>> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName, final ListOperationCallback<DetectorDefinitionInner> serviceCallback) {
+    public ServiceFuture<List<DetectorResponseInner>> listSiteDetectorResponsesSlotAsync(final String resourceGroupName, final String siteName, final String slot, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName),
-            new Func1<String, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+            listSiteDetectorResponsesSlotSinglePageAsync(resourceGroupName, siteName, slot),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(String nextPageLink) {
-                    return getSiteDetectorNextSinglePageAsync(nextPageLink);
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink);
                 }
             },
             serviceCallback);
     }
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param detectorName Detector Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<Page<DetectorDefinitionInner>> getSiteDetectorAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
-        return getSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, diagnosticCategory, detectorName)
-            .map(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Page<DetectorDefinitionInner>>() {
+    public Observable<Page<DetectorResponseInner>> listSiteDetectorResponsesSlotAsync(final String resourceGroupName, final String siteName, final String slot) {
+        return listSiteDetectorResponsesSlotWithServiceResponseAsync(resourceGroupName, siteName, slot)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
                 @Override
-                public Page<DetectorDefinitionInner> call(ServiceResponse<Page<DetectorDefinitionInner>> response) {
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
                     return response.body();
                 }
             });
     }
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
-     * @param diagnosticCategory Diagnostic Category
-     * @param detectorName Detector Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PagedList&lt;DetectorDefinitionInner&gt; object
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
      */
-    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> getSiteDetectorWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
-        return getSiteDetectorSinglePageAsync(resourceGroupName, siteName, diagnosticCategory, detectorName)
-            .concatMap(new Func1<ServiceResponse<Page<DetectorDefinitionInner>>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesSlotWithServiceResponseAsync(final String resourceGroupName, final String siteName, final String slot) {
+        return listSiteDetectorResponsesSlotSinglePageAsync(resourceGroupName, siteName, slot)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(ServiceResponse<Page<DetectorDefinitionInner>> page) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
                     String nextPageLink = page.body().nextPageLink();
                     if (nextPageLink == null) {
                         return Observable.just(page);
                     }
-                    return Observable.just(page).concatWith(getSiteDetectorNextWithServiceResponseAsync(nextPageLink));
+                    return Observable.just(page).concatWith(listSiteDetectorResponsesSlotNextWithServiceResponseAsync(nextPageLink));
                 }
             });
     }
 
     /**
-     * Get Detector.
-     * Get Detector.
+     * List Site Detector Responses.
+     * List Site Detector Responses.
      *
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param siteName Site Name
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param diagnosticCategory Diagnostic Category
-    ServiceResponse<PageImpl<DetectorDefinitionInner>> * @param detectorName Detector Name
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param siteName Site Name
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the PagedList&lt;DetectorDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> getSiteDetectorSinglePageAsync(final String resourceGroupName, final String siteName, final String diagnosticCategory, final String detectorName) {
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesSlotSinglePageAsync(final String resourceGroupName, final String siteName, final String slot) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
         if (siteName == null) {
             throw new IllegalArgumentException("Parameter siteName is required and cannot be null.");
         }
-        if (diagnosticCategory == null) {
-            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
-        }
-        if (detectorName == null) {
-            throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -1097,13 +2145,13 @@ public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> getSiteDetecto
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.getSiteDetector(resourceGroupName, siteName, diagnosticCategory, detectorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorDefinitionInner>>>>() {
+        return service.listSiteDetectorResponsesSlot(resourceGroupName, siteName, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<DetectorDefinitionInner>> result = getSiteDetectorDelegate(response);
-                        return Observable.just(new ServiceResponse<Page<DetectorDefinitionInner>>(result.body(), result.response()));
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listSiteDetectorResponsesSlotDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1111,78 +2159,78 @@ public Observable<ServiceResponse<Page<DetectorDefinitionInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<DetectorDefinitionInner>> getSiteDetectorDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorDefinitionInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<DetectorDefinitionInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listSiteDetectorResponsesSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticDetectorResponseInner object if successful.
+     * @return the DetectorResponseInner object if successful.
      */
-    public DiagnosticDetectorResponseInner executeSiteDetector(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
-        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory).toBlocking().single().body();
+    public DetectorResponseInner getSiteDetectorResponseSlot(String resourceGroupName, String siteName, String detectorName, String slot) {
+        return getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot).toBlocking().single().body();
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @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<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, final ServiceCallback<DiagnosticDetectorResponseInner> serviceCallback) {
-        return ServiceFuture.fromResponse(executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory), serviceCallback);
+    public ServiceFuture<DetectorResponseInner> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot), serviceCallback);
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticDetectorResponseInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
-        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory).map(new Func1<ServiceResponse<DiagnosticDetectorResponseInner>, DiagnosticDetectorResponseInner>() {
+    public Observable<DetectorResponseInner> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot) {
+        return getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
             @Override
-            public DiagnosticDetectorResponseInner call(ServiceResponse<DiagnosticDetectorResponseInner> response) {
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticDetectorResponseInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteDetectorWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory) {
+    public Observable<ServiceResponse<DetectorResponseInner>> getSiteDetectorResponseSlotWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String slot) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -1192,8 +2240,8 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteD
         if (detectorName == null) {
             throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
         }
-        if (diagnosticCategory == null) {
-            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -1204,12 +2252,12 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteD
         final DateTime startTime = null;
         final DateTime endTime = null;
         final String timeGrain = null;
-        return service.executeSiteDetector(resourceGroupName, siteName, detectorName, diagnosticCategory, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticDetectorResponseInner>>>() {
+        return service.getSiteDetectorResponseSlot(resourceGroupName, siteName, detectorName, slot, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticDetectorResponseInner> clientResponse = executeSiteDetectorDelegate(response);
+                        ServiceResponse<DetectorResponseInner> clientResponse = getSiteDetectorResponseSlotDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1218,34 +2266,34 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Respons
             });
     }
 
-    /**
-     * Execute Detector.
-     * Execute Detector.
+    /**
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @param startTime Start Time
      * @param endTime End Time
      * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the DiagnosticDetectorResponseInner object if successful.
+     * @return the DetectorResponseInner object if successful.
      */
-    public DiagnosticDetectorResponseInner executeSiteDetector(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
-        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain).toBlocking().single().body();
+    public DetectorResponseInner getSiteDetectorResponseSlot(String resourceGroupName, String siteName, String detectorName, String slot, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot, startTime, endTime, timeGrain).toBlocking().single().body();
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @param startTime Start Time
      * @param endTime End Time
      * @param timeGrain Time Grain
@@ -1253,48 +2301,48 @@ public DiagnosticDetectorResponseInner executeSiteDetector(String resourceGroupN
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DiagnosticDetectorResponseInner> serviceCallback) {
-        return ServiceFuture.fromResponse(executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain), serviceCallback);
+    public ServiceFuture<DetectorResponseInner> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot, DateTime startTime, DateTime endTime, String timeGrain, final ServiceCallback<DetectorResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot, startTime, endTime, timeGrain), serviceCallback);
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @param startTime Start Time
      * @param endTime End Time
      * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticDetectorResponseInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<DiagnosticDetectorResponseInner> executeSiteDetectorAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
-        return executeSiteDetectorWithServiceResponseAsync(resourceGroupName, siteName, detectorName, diagnosticCategory, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DiagnosticDetectorResponseInner>, DiagnosticDetectorResponseInner>() {
+    public Observable<DetectorResponseInner> getSiteDetectorResponseSlotAsync(String resourceGroupName, String siteName, String detectorName, String slot, DateTime startTime, DateTime endTime, String timeGrain) {
+        return getSiteDetectorResponseSlotWithServiceResponseAsync(resourceGroupName, siteName, detectorName, slot, startTime, endTime, timeGrain).map(new Func1<ServiceResponse<DetectorResponseInner>, DetectorResponseInner>() {
             @Override
-            public DiagnosticDetectorResponseInner call(ServiceResponse<DiagnosticDetectorResponseInner> response) {
+            public DetectorResponseInner call(ServiceResponse<DetectorResponseInner> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Execute Detector.
-     * Execute Detector.
+     * Get site detector response.
+     * Get site detector response.
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Site Name
      * @param detectorName Detector Resource Name
-     * @param diagnosticCategory Category Name
+     * @param slot Slot Name
      * @param startTime Start Time
      * @param endTime End Time
      * @param timeGrain Time Grain
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the DiagnosticDetectorResponseInner object
+     * @return the observable to the DetectorResponseInner object
      */
-    public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteDetectorWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String diagnosticCategory, DateTime startTime, DateTime endTime, String timeGrain) {
+    public Observable<ServiceResponse<DetectorResponseInner>> getSiteDetectorResponseSlotWithServiceResponseAsync(String resourceGroupName, String siteName, String detectorName, String slot, DateTime startTime, DateTime endTime, String timeGrain) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -1304,8 +2352,8 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteD
         if (detectorName == null) {
             throw new IllegalArgumentException("Parameter detectorName is required and cannot be null.");
         }
-        if (diagnosticCategory == null) {
-            throw new IllegalArgumentException("Parameter diagnosticCategory is required and cannot be null.");
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
         }
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
@@ -1313,12 +2361,12 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> executeSiteD
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.executeSiteDetector(resourceGroupName, siteName, detectorName, diagnosticCategory, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DiagnosticDetectorResponseInner>>>() {
+        return service.getSiteDetectorResponseSlot(resourceGroupName, siteName, detectorName, slot, this.client.subscriptionId(), startTime, endTime, timeGrain, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DetectorResponseInner>>>() {
                 @Override
-                public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<DetectorResponseInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DiagnosticDetectorResponseInner> clientResponse = executeSiteDetectorDelegate(response);
+                        ServiceResponse<DetectorResponseInner> clientResponse = getSiteDetectorResponseSlotDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1327,9 +2375,9 @@ public Observable<ServiceResponse<DiagnosticDetectorResponseInner>> call(Respons
             });
     }
 
-    private ServiceResponse<DiagnosticDetectorResponseInner> executeSiteDetectorDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<DiagnosticDetectorResponseInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<DiagnosticDetectorResponseInner>() { }.getType())
+    private ServiceResponse<DetectorResponseInner> getSiteDetectorResponseSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<DetectorResponseInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<DetectorResponseInner>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
@@ -2585,6 +3633,238 @@ private ServiceResponse<DiagnosticDetectorResponseInner> executeSiteDetectorSlot
                 .build(response);
     }
 
+    /**
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
+     */
+    public PagedList<DetectorResponseInner> listHostingEnvironmentDetectorResponsesNext(final String nextPageLink) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
+            @Override
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesNextAsync(final String nextPageLink, final ServiceFuture<List<DetectorResponseInner>> serviceFuture, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<Page<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesNextAsync(final String nextPageLink) {
+        return listHostingEnvironmentDetectorResponsesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
+                @Override
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listHostingEnvironmentDetectorResponsesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listHostingEnvironmentDetectorResponsesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listHostingEnvironmentDetectorResponsesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List Hosting Environment Detector Responses.
+     * List Hosting Environment Detector Responses.
+     *
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listHostingEnvironmentDetectorResponsesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listHostingEnvironmentDetectorResponsesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listHostingEnvironmentDetectorResponsesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listHostingEnvironmentDetectorResponsesNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
+     */
+    public PagedList<DetectorResponseInner> listSiteDetectorResponsesNext(final String nextPageLink) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listSiteDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
+            @Override
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listSiteDetectorResponsesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<DetectorResponseInner>> listSiteDetectorResponsesNextAsync(final String nextPageLink, final ServiceFuture<List<DetectorResponseInner>> serviceFuture, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSiteDetectorResponsesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listSiteDetectorResponsesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<Page<DetectorResponseInner>> listSiteDetectorResponsesNextAsync(final String nextPageLink) {
+        return listSiteDetectorResponsesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
+                @Override
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listSiteDetectorResponsesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSiteDetectorResponsesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listSiteDetectorResponsesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listSiteDetectorResponsesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listSiteDetectorResponsesNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Get Diagnostics Categories.
      * Get Diagnostics Categories.
@@ -3049,6 +4329,122 @@ private ServiceResponse<PageImpl<DetectorDefinitionInner>> getSiteDetectorNextDe
                 .build(response);
     }
 
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;DetectorResponseInner&gt; object if successful.
+     */
+    public PagedList<DetectorResponseInner> listSiteDetectorResponsesSlotNext(final String nextPageLink) {
+        ServiceResponse<Page<DetectorResponseInner>> response = listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<DetectorResponseInner>(response.body()) {
+            @Override
+            public Page<DetectorResponseInner> nextPage(String nextPageLink) {
+                return listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<DetectorResponseInner>> listSiteDetectorResponsesSlotNextAsync(final String nextPageLink, final ServiceFuture<List<DetectorResponseInner>> serviceFuture, final ListOperationCallback<DetectorResponseInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(String nextPageLink) {
+                    return listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<Page<DetectorResponseInner>> listSiteDetectorResponsesSlotNextAsync(final String nextPageLink) {
+        return listSiteDetectorResponsesSlotNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Page<DetectorResponseInner>>() {
+                @Override
+                public Page<DetectorResponseInner> call(ServiceResponse<Page<DetectorResponseInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;DetectorResponseInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesSlotNextWithServiceResponseAsync(final String nextPageLink) {
+        return listSiteDetectorResponsesSlotNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<DetectorResponseInner>>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(ServiceResponse<Page<DetectorResponseInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSiteDetectorResponsesSlotNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List Site Detector Responses.
+     * List Site Detector Responses.
+     *
+    ServiceResponse<PageImpl<DetectorResponseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;DetectorResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<DetectorResponseInner>>> listSiteDetectorResponsesSlotNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listSiteDetectorResponsesSlotNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<DetectorResponseInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<DetectorResponseInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<DetectorResponseInner>> result = listSiteDetectorResponsesSlotNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<DetectorResponseInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<DetectorResponseInner>> listSiteDetectorResponsesSlotNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DetectorResponseInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DetectorResponseInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Get Diagnostics Categories.
      * Get Diagnostics Categories.
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainAvailablilityCheckResultImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainAvailablilityCheckResultImpl.java
index 4feaf79e22e5..0a3a03ca02e5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainAvailablilityCheckResultImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainAvailablilityCheckResultImpl.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DomainType;
 
 class DomainAvailablilityCheckResultImpl extends WrapperImpl<DomainAvailablilityCheckResultInner> implements DomainAvailablilityCheckResult {
-    private final AppServiceManager manager;
-    DomainAvailablilityCheckResultImpl(DomainAvailablilityCheckResultInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    DomainAvailablilityCheckResultImpl(DomainAvailablilityCheckResultInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainControlCenterSsoRequestImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainControlCenterSsoRequestImpl.java
index 74e086225578..98cd5c1468ca 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainControlCenterSsoRequestImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainControlCenterSsoRequestImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DomainControlCenterSsoRequestImpl extends WrapperImpl<DomainControlCenterSsoRequestInner> implements DomainControlCenterSsoRequest {
-    private final AppServiceManager manager;
-    DomainControlCenterSsoRequestImpl(DomainControlCenterSsoRequestInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    DomainControlCenterSsoRequestImpl(DomainControlCenterSsoRequestInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainImpl.java
index dea347ef52ba..1bebeb08901d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainImpl.java
@@ -22,9 +22,9 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DnsType;
 import rx.functions.Func1;
 
-class DomainImpl extends GroupableResourceCoreImpl<Domain, DomainInner, DomainImpl, AppServiceManager> implements Domain, Domain.Definition, Domain.Update {
+class DomainImpl extends GroupableResourceCoreImpl<Domain, DomainInner, DomainImpl, CertificateRegistrationManager> implements Domain, Domain.Definition, Domain.Update {
     private DomainPatchResource updateParameter;
-    DomainImpl(String name, DomainInner inner, AppServiceManager manager) {
+    DomainImpl(String name, DomainInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new DomainPatchResource();
     }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainOwnershipIdentifierImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainOwnershipIdentifierImpl.java
index 6d8dbf17a268..0d612f238563 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainOwnershipIdentifierImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainOwnershipIdentifierImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DomainOwnershipIdentifierImpl extends CreatableUpdatableImpl<DomainOwnershipIdentifier, DomainOwnershipIdentifierInner, DomainOwnershipIdentifierImpl> implements DomainOwnershipIdentifier, DomainOwnershipIdentifier.Definition, DomainOwnershipIdentifier.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String domainName;
     private String name;
 
-    DomainOwnershipIdentifierImpl(String name, AppServiceManager manager) {
+    DomainOwnershipIdentifierImpl(String name, CertificateRegistrationManager manager) {
         super(name, new DomainOwnershipIdentifierInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class DomainOwnershipIdentifierImpl extends CreatableUpdatableImpl<DomainOwnersh
         //
     }
 
-    DomainOwnershipIdentifierImpl(DomainOwnershipIdentifierInner inner, AppServiceManager manager) {
+    DomainOwnershipIdentifierImpl(DomainOwnershipIdentifierInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class DomainOwnershipIdentifierImpl extends CreatableUpdatableImpl<DomainOwnersh
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainRegistrationProvidersImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainRegistrationProvidersImpl.java
index c3c6dab0c6b8..688f6aca24d8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainRegistrationProvidersImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainRegistrationProvidersImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CsmOperationDescription;
 
 class DomainRegistrationProvidersImpl extends WrapperImpl<DomainRegistrationProvidersInner> implements DomainRegistrationProviders {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    DomainRegistrationProvidersImpl(AppServiceManager manager) {
+    DomainRegistrationProvidersImpl(CertificateRegistrationManager manager) {
         super(manager.inner().domainRegistrationProviders());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainsImpl.java
index 1f53d9b188be..696d42f962fd 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/DomainsImpl.java
@@ -28,8 +28,8 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DomainRecommendationSearchParameters;
 import com.microsoft.azure.management.appservice.v2018_02_01.DomainOwnershipIdentifier;
 
-class DomainsImpl extends GroupableResourcesCoreImpl<Domain, DomainImpl, DomainInner, DomainsInner, AppServiceManager>  implements Domains {
-    protected DomainsImpl(AppServiceManager manager) {
+class DomainsImpl extends GroupableResourcesCoreImpl<Domain, DomainImpl, DomainInner, DomainsInner, CertificateRegistrationManager>  implements Domains {
+    protected DomainsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().domains(), manager);
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionEnvelopeImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionEnvelopeImpl.java
index a6450946278b..72f0e84583d1 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionEnvelopeImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionEnvelopeImpl.java
@@ -14,12 +14,12 @@
 import java.util.Map;
 
 class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, FunctionEnvelopeInner, FunctionEnvelopeImpl> implements FunctionEnvelope, FunctionEnvelope.Definition, FunctionEnvelope.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String functionName;
 
-    FunctionEnvelopeImpl(String name, AppServiceManager manager) {
+    FunctionEnvelopeImpl(String name, CertificateRegistrationManager manager) {
         super(name, new FunctionEnvelopeInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, Func
         //
     }
 
-    FunctionEnvelopeImpl(FunctionEnvelopeInner inner, AppServiceManager manager) {
+    FunctionEnvelopeImpl(FunctionEnvelopeInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class FunctionEnvelopeImpl extends CreatableUpdatableImpl<FunctionEnvelope, Func
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionSecretsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionSecretsImpl.java
index 0d05147b57d0..97057535c0f4 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionSecretsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/FunctionSecretsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class FunctionSecretsImpl extends WrapperImpl<FunctionSecretsInner> implements FunctionSecrets {
-    private final AppServiceManager manager;
-    FunctionSecretsImpl(FunctionSecretsInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    FunctionSecretsImpl(FunctionSecretsInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostNameBindingImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostNameBindingImpl.java
index 5bf5f50a4d41..e32c690485ce 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostNameBindingImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostNameBindingImpl.java
@@ -17,12 +17,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SslState;
 
 class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNameBindingInner, HostNameBindingImpl> implements HostNameBinding, HostNameBinding.Definition, HostNameBinding.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String hostName;
 
-    HostNameBindingImpl(String name, AppServiceManager manager) {
+    HostNameBindingImpl(String name, CertificateRegistrationManager manager) {
         super(name, new HostNameBindingInner());
         this.manager = manager;
         // Set resource name
@@ -30,7 +30,7 @@ class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNa
         //
     }
 
-    HostNameBindingImpl(HostNameBindingInner inner, AppServiceManager manager) {
+    HostNameBindingImpl(HostNameBindingInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -43,7 +43,7 @@ class HostNameBindingImpl extends CreatableUpdatableImpl<HostNameBinding, HostNa
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentAppServicePlanImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentAppServicePlanImpl.java
index 638245a77799..07a74e656208 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentAppServicePlanImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentAppServicePlanImpl.java
@@ -11,23 +11,23 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.HostingEnvironmentAppServicePlan;
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import rx.Observable;
+import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.HostingEnvironmentProfile;
 import com.microsoft.azure.management.appservice.v2018_02_01.ProvisioningState;
 import com.microsoft.azure.management.appservice.v2018_02_01.SkuDescription;
-import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.StatusOptions;
 import java.util.Map;
 
 class HostingEnvironmentAppServicePlanImpl extends WrapperImpl<AppServicePlanInner> implements HostingEnvironmentAppServicePlan {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    HostingEnvironmentAppServicePlanImpl(AppServicePlanInner inner,  AppServiceManager manager) {
+    HostingEnvironmentAppServicePlanImpl(AppServicePlanInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -38,6 +38,11 @@ public String adminSiteName() {
         return this.inner().adminSiteName();
     }
 
+    @Override
+    public DateTime freeOfferExpirationTime() {
+        return this.inner().freeOfferExpirationTime();
+    }
+
     @Override
     public String geoRegion() {
         return this.inner().geoRegion();
@@ -48,6 +53,11 @@ public HostingEnvironmentProfile hostingEnvironmentProfile() {
         return this.inner().hostingEnvironmentProfile();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public String id() {
         return this.inner().id();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentDiagnosticsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentDiagnosticsImpl.java
index eb9ccb2699e5..b6cb384f3a3c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentDiagnosticsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentDiagnosticsImpl.java
@@ -13,18 +13,18 @@
 import rx.Observable;
 
 class HostingEnvironmentDiagnosticsImpl extends WrapperImpl<HostingEnvironmentDiagnosticsInner> implements HostingEnvironmentDiagnostics {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String diagnosticsName;
 
-    HostingEnvironmentDiagnosticsImpl(HostingEnvironmentDiagnosticsInner inner,  AppServiceManager manager) {
+    HostingEnvironmentDiagnosticsImpl(HostingEnvironmentDiagnosticsInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentResourceMetricImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentResourceMetricImpl.java
index f948db7e0513..495aefe0b31c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentResourceMetricImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ResourceMetricProperty;
 
 class HostingEnvironmentResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements HostingEnvironmentResourceMetric {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    HostingEnvironmentResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    HostingEnvironmentResourceMetricImpl(ResourceMetricInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentSiteImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentSiteImpl.java
index b6f608fbb501..3012ae04c90f 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentSiteImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HostingEnvironmentSiteImpl.java
@@ -20,20 +20,19 @@
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotSwapStatus;
-import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRecoveryRequest;
 import java.util.Map;
 import com.microsoft.azure.management.appservice.v2018_02_01.UsageState;
 
 class HostingEnvironmentSiteImpl extends WrapperImpl<SiteInner> implements HostingEnvironmentSite {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    HostingEnvironmentSiteImpl(SiteInner inner,  AppServiceManager manager) {
+    HostingEnvironmentSiteImpl(SiteInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -109,6 +108,11 @@ public Boolean httpsOnly() {
         return this.inner().httpsOnly();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public String id() {
         return this.inner().id();
@@ -199,11 +203,6 @@ public SlotSwapStatus slotSwapStatus() {
         return this.inner().slotSwapStatus();
     }
 
-    @Override
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.inner().snapshotInfo();
-    }
-
     @Override
     public String state() {
         return this.inner().state();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionImpl.java
index 51f2d4b08a3e..36d1ea278fa0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class HybridConnectionImpl extends WrapperImpl<HybridConnectionInner> implements HybridConnection {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    HybridConnectionImpl(HybridConnectionInner inner,  AppServiceManager manager) {
+    HybridConnectionImpl(HybridConnectionInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionKeyImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionKeyImpl.java
index e36f0a4605c2..08fd4833e5d6 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionKeyImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionKeyImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class HybridConnectionKeyImpl extends WrapperImpl<HybridConnectionKeyInner> implements HybridConnectionKey {
-    private final AppServiceManager manager;
-    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    HybridConnectionKeyImpl(HybridConnectionKeyInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionLimitsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionLimitsImpl.java
index 80198832955f..7f14e36257f7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionLimitsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/HybridConnectionLimitsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class HybridConnectionLimitsImpl extends WrapperImpl<HybridConnectionLimitsInner> implements HybridConnectionLimits {
-    private final AppServiceManager manager;
-    HybridConnectionLimitsImpl(HybridConnectionLimitsInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    HybridConnectionLimitsImpl(HybridConnectionLimitsInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/IdentifierImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/IdentifierImpl.java
index 8e2c2f038f92..eba03204b8ff 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/IdentifierImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/IdentifierImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner, IdentifierImpl> implements Identifier, Identifier.Definition, Identifier.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String domainOwnershipIdentifierName;
 
-    IdentifierImpl(String name, AppServiceManager manager) {
+    IdentifierImpl(String name, CertificateRegistrationManager manager) {
         super(name, new IdentifierInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner,
         //
     }
 
-    IdentifierImpl(IdentifierInner inner, AppServiceManager manager) {
+    IdentifierImpl(IdentifierInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class IdentifierImpl extends CreatableUpdatableImpl<Identifier, IdentifierInner,
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployLogImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployLogImpl.java
index 0ebead3f97ff..5e0543603546 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployLogImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployLogImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.MSDeployLogEntry;
 
 class MSDeployLogImpl extends WrapperImpl<MSDeployLogInner> implements MSDeployLog {
-    private final AppServiceManager manager;
-    MSDeployLogImpl(MSDeployLogInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    MSDeployLogImpl(MSDeployLogInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployStatusImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployStatusImpl.java
index fde126df6740..67fc742ae020 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployStatusImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MSDeployStatusImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.MSDeployProvisioningState;
 
 class MSDeployStatusImpl extends WrapperImpl<MSDeployStatusInner> implements MSDeployStatus {
-    private final AppServiceManager manager;
-    MSDeployStatusImpl(MSDeployStatusInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    MSDeployStatusImpl(MSDeployStatusInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MetricDefinitionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MetricDefinitionImpl.java
index 3a593f9fe0ce..de7fd30bb018 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MetricDefinitionImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.MetricAvailabilily;
 
 class MetricDefinitionImpl extends WrapperImpl<MetricDefinitionInner> implements MetricDefinition {
-    private final AppServiceManager manager;
-    MetricDefinitionImpl(MetricDefinitionInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    MetricDefinitionImpl(MetricDefinitionInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MigrateMySqlStatusImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MigrateMySqlStatusImpl.java
index aa1a3a68388e..8cb76d824ec7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MigrateMySqlStatusImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MigrateMySqlStatusImpl.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.OperationStatus;
 
 class MigrateMySqlStatusImpl extends WrapperImpl<MigrateMySqlStatusInner> implements MigrateMySqlStatus {
-    private final AppServiceManager manager;
-    MigrateMySqlStatusImpl(MigrateMySqlStatusInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    MigrateMySqlStatusImpl(MigrateMySqlStatusInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MultiRolePoolsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MultiRolePoolsImpl.java
index 482c010b1bbd..6d5a5b346397 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MultiRolePoolsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/MultiRolePoolsImpl.java
@@ -16,15 +16,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SkuDescription;
 
 class MultiRolePoolsImpl extends WrapperImpl<WorkerPoolResourceInner> implements MultiRolePools {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    MultiRolePoolsImpl(WorkerPoolResourceInner inner,  AppServiceManager manager) {
+    MultiRolePoolsImpl(WorkerPoolResourceInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NameIdentifierImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NameIdentifierImpl.java
index 311f5cda15b6..ac702d3c686c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NameIdentifierImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NameIdentifierImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class NameIdentifierImpl extends WrapperImpl<NameIdentifierInner> implements NameIdentifier {
-    private final AppServiceManager manager;
-    NameIdentifierImpl(NameIdentifierInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    NameIdentifierImpl(NameIdentifierInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkFeaturesImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkFeaturesImpl.java
index 6331613a0e78..b423b79be654 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkFeaturesImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkFeaturesImpl.java
@@ -18,12 +18,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteVnetInfo;
 
 class NetworkFeaturesImpl extends IndexableRefreshableWrapperImpl<NetworkFeatures, NetworkFeaturesInner> implements NetworkFeatures {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String view;
 
-    NetworkFeaturesImpl(NetworkFeaturesInner inner,  AppServiceManager manager) {
+    NetworkFeaturesImpl(NetworkFeaturesInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class NetworkFeaturesImpl extends IndexableRefreshableWrapperImpl<NetworkFeature
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceImpl.java
new file mode 100644
index 000000000000..1120753587b9
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceImpl.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.NetworkTrace;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class NetworkTraceImpl extends WrapperImpl<NetworkTraceInner> implements NetworkTrace {
+    private final CertificateRegistrationManager manager;
+    NetworkTraceImpl(NetworkTraceInner inner, CertificateRegistrationManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String message() {
+        return this.inner().message();
+    }
+
+    @Override
+    public String path() {
+        return this.inner().path();
+    }
+
+    @Override
+    public String status() {
+        return this.inner().status();
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceInner.java
new file mode 100644
index 000000000000..dc6e6f52e2ef
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/NetworkTraceInner.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network trace.
+ */
+public class NetworkTraceInner {
+    /**
+     * Local file path for the captured network trace file.
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * Current status of the network trace operation, same as Operation.Status
+     * (InProgress/Succeeded/Failed).
+     */
+    @JsonProperty(value = "status")
+    private String status;
+
+    /**
+     * Detailed message of a network trace operation, e.g. error message in
+     * case of failure.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Get local file path for the captured network trace file.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set local file path for the captured network trace file.
+     *
+     * @param path the path value to set
+     * @return the NetworkTraceInner object itself.
+     */
+    public NetworkTraceInner withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get current status of the network trace operation, same as Operation.Status (InProgress/Succeeded/Failed).
+     *
+     * @return the status value
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set current status of the network trace operation, same as Operation.Status (InProgress/Succeeded/Failed).
+     *
+     * @param status the status value to set
+     * @return the NetworkTraceInner object itself.
+     */
+    public NetworkTraceInner withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get detailed message of a network trace operation, e.g. error message in case of failure.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set detailed message of a network trace operation, e.g. error message in case of failure.
+     *
+     * @param message the message value to set
+     * @return the NetworkTraceInner object itself.
+     */
+    public NetworkTraceInner withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/OperationImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/OperationImpl.java
index 98eca1f42064..80f0e23e6cdb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/OperationImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/OperationImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.OperationStatus;
 
 class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    OperationImpl(OperationInner inner,  AppServiceManager manager) {
+    OperationImpl(OperationInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PerfMonResponseImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PerfMonResponseImpl.java
index 19a1f3f8d11c..0c26493b3590 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PerfMonResponseImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PerfMonResponseImpl.java
@@ -14,15 +14,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.PerfMonSet;
 
 class PerfMonResponseImpl extends WrapperImpl<PerfMonResponseInner> implements PerfMonResponse {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    PerfMonResponseImpl(PerfMonResponseInner inner,  AppServiceManager manager) {
+    PerfMonResponseImpl(PerfMonResponseInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PremierAddOnImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PremierAddOnImpl.java
index aace60013e5e..08225f2befa0 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PremierAddOnImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PremierAddOnImpl.java
@@ -11,23 +11,27 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.PremierAddOn;
 import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
+import com.microsoft.azure.management.appservice.v2018_02_01.PremierAddOnPatchResource;
 import java.util.Map;
+import rx.functions.Func1;
 
 class PremierAddOnImpl extends CreatableUpdatableImpl<PremierAddOn, PremierAddOnInner, PremierAddOnImpl> implements PremierAddOn, PremierAddOn.Definition, PremierAddOn.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String premierAddOnName;
+    private PremierAddOnPatchResource updateParameter;
 
-    PremierAddOnImpl(String name, AppServiceManager manager) {
+    PremierAddOnImpl(String name, CertificateRegistrationManager manager) {
         super(name, new PremierAddOnInner());
         this.manager = manager;
         // Set resource name
         this.premierAddOnName = name;
         //
+        this.updateParameter = new PremierAddOnPatchResource();
     }
 
-    PremierAddOnImpl(PremierAddOnInner inner, AppServiceManager manager) {
+    PremierAddOnImpl(PremierAddOnInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -37,10 +41,11 @@ class PremierAddOnImpl extends CreatableUpdatableImpl<PremierAddOn, PremierAddOn
         this.name = IdParsingUtils.getValueFromIdByName(inner.id(), "sites");
         this.premierAddOnName = IdParsingUtils.getValueFromIdByName(inner.id(), "premieraddons");
         //
+        this.updateParameter = new PremierAddOnPatchResource();
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -48,13 +53,27 @@ public AppServiceManager manager() {
     public Observable<PremierAddOn> createResourceAsync() {
         WebAppsInner client = this.manager().inner().webApps();
         return client.addPremierAddOnAsync(this.resourceGroupName, this.name, this.premierAddOnName, this.inner())
+            .map(new Func1<PremierAddOnInner, PremierAddOnInner>() {
+               @Override
+               public PremierAddOnInner call(PremierAddOnInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
             .map(innerToFluentMap(this));
     }
 
     @Override
     public Observable<PremierAddOn> updateResourceAsync() {
         WebAppsInner client = this.manager().inner().webApps();
-        return client.addPremierAddOnAsync(this.resourceGroupName, this.name, this.premierAddOnName, this.inner())
+        return client.updatePremierAddOnAsync(this.resourceGroupName, this.name, this.premierAddOnName, this.updateParameter)
+            .map(new Func1<PremierAddOnInner, PremierAddOnInner>() {
+               @Override
+               public PremierAddOnInner call(PremierAddOnInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
             .map(innerToFluentMap(this));
     }
 
@@ -69,6 +88,9 @@ public boolean isInCreateMode() {
         return this.inner().id() == null;
     }
 
+    private void resetCreateUpdateParameters() {
+        this.updateParameter = new PremierAddOnPatchResource();
+    }
 
     @Override
     public String id() {
@@ -138,45 +160,69 @@ public PremierAddOnImpl withLocation(String location) {
         return this;
     }
 
+    @Override
+    public PremierAddOnImpl withTags(Map<String, String> tags) {
+        this.inner().withTags(tags);
+        return this;
+    }
+
     @Override
     public PremierAddOnImpl withKind(String kind) {
-        this.inner().withKind(kind);
+        if (isInCreateMode()) {
+            this.inner().withKind(kind);
+        } else {
+            this.updateParameter.withKind(kind);
+        }
         return this;
     }
 
     @Override
     public PremierAddOnImpl withMarketplaceOffer(String marketplaceOffer) {
-        this.inner().withMarketplaceOffer(marketplaceOffer);
+        if (isInCreateMode()) {
+            this.inner().withMarketplaceOffer(marketplaceOffer);
+        } else {
+            this.updateParameter.withMarketplaceOffer(marketplaceOffer);
+        }
         return this;
     }
 
     @Override
     public PremierAddOnImpl withMarketplacePublisher(String marketplacePublisher) {
-        this.inner().withMarketplacePublisher(marketplacePublisher);
+        if (isInCreateMode()) {
+            this.inner().withMarketplacePublisher(marketplacePublisher);
+        } else {
+            this.updateParameter.withMarketplacePublisher(marketplacePublisher);
+        }
         return this;
     }
 
     @Override
     public PremierAddOnImpl withProduct(String product) {
-        this.inner().withProduct(product);
+        if (isInCreateMode()) {
+            this.inner().withProduct(product);
+        } else {
+            this.updateParameter.withProduct(product);
+        }
         return this;
     }
 
     @Override
     public PremierAddOnImpl withSku(String sku) {
-        this.inner().withSku(sku);
-        return this;
-    }
-
-    @Override
-    public PremierAddOnImpl withTags(Map<String, String> tags) {
-        this.inner().withTags(tags);
+        if (isInCreateMode()) {
+            this.inner().withSku(sku);
+        } else {
+            this.updateParameter.withSku(sku);
+        }
         return this;
     }
 
     @Override
     public PremierAddOnImpl withVendor(String vendor) {
-        this.inner().withVendor(vendor);
+        if (isInCreateMode()) {
+            this.inner().withVendor(vendor);
+        } else {
+            this.updateParameter.withVendor(vendor);
+        }
         return this;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PrivateAccessImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PrivateAccessImpl.java
index 824b9bbbd17f..64011ad2ae78 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PrivateAccessImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PrivateAccessImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.PrivateAccessVirtualNetwork;
 
 class PrivateAccessImpl extends WrapperImpl<PrivateAccessInner> implements PrivateAccess {
-    private final AppServiceManager manager;
-    PrivateAccessImpl(PrivateAccessInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    PrivateAccessImpl(PrivateAccessInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessInfoImpl.java
index fd5a0e1628ad..8db8a41591dc 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessInfoImpl.java
@@ -19,13 +19,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ProcessThreadInfo;
 
 class ProcessInfoImpl extends IndexableRefreshableWrapperImpl<ProcessInfo, ProcessInfoInner> implements ProcessInfo {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String instanceId;
 
-    ProcessInfoImpl(ProcessInfoInner inner,  AppServiceManager manager) {
+    ProcessInfoImpl(ProcessInfoInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -35,7 +35,7 @@ class ProcessInfoImpl extends IndexableRefreshableWrapperImpl<ProcessInfo, Proce
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessModuleInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessModuleInfoImpl.java
index 700cc078e888..84753b116174 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessModuleInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessModuleInfoImpl.java
@@ -13,14 +13,14 @@
 import rx.Observable;
 
 class ProcessModuleInfoImpl extends IndexableRefreshableWrapperImpl<ProcessModuleInfo, ProcessModuleInfoInner> implements ProcessModuleInfo {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String baseAddress;
     private String instanceId;
 
-    ProcessModuleInfoImpl(ProcessModuleInfoInner inner,  AppServiceManager manager) {
+    ProcessModuleInfoImpl(ProcessModuleInfoInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class ProcessModuleInfoImpl extends IndexableRefreshableWrapperImpl<ProcessModul
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessThreadInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessThreadInfoImpl.java
index 483db2ea9dc3..c713b3a94816 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessThreadInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProcessThreadInfoImpl.java
@@ -14,14 +14,14 @@
 import org.joda.time.DateTime;
 
 class ProcessThreadInfoImpl extends IndexableRefreshableWrapperImpl<ProcessThreadInfo, ProcessThreadInfoInner> implements ProcessThreadInfo {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String processId;
     private String threadId;
     private String instanceId;
 
-    ProcessThreadInfoImpl(ProcessThreadInfoInner inner,  AppServiceManager manager) {
+    ProcessThreadInfoImpl(ProcessThreadInfoInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class ProcessThreadInfoImpl extends IndexableRefreshableWrapperImpl<ProcessThrea
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersImpl.java
index fbb2d8476cad..49f11c65e1ad 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CsmOperationDescription;
 
 class ProvidersImpl extends WrapperImpl<ProvidersInner> implements Providers {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    ProvidersImpl(AppServiceManager manager) {
+    ProvidersImpl(CertificateRegistrationManager manager) {
         super(manager.inner().providers());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersInner.java
index 4456db22cf4c..64975639bedc 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ProvidersInner.java
@@ -189,7 +189,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(Response<Re
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -209,7 +209,7 @@ public Page<ApplicationStackInner> nextPage(String nextPageLink) {
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -230,7 +230,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(String next
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ApplicationStackInner&gt; object
      */
@@ -248,7 +248,7 @@ public Page<ApplicationStackInner> call(ServiceResponse<Page<ApplicationStackInn
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ApplicationStackInner&gt; object
      */
@@ -270,7 +270,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(ServiceResp
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-    ServiceResponse<PageImpl<ApplicationStackInner>> * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+    ServiceResponse<PageImpl<ApplicationStackInner>> * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ApplicationStackInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -518,7 +518,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(Response<Re
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -538,7 +538,7 @@ public Page<ApplicationStackInner> nextPage(String nextPageLink) {
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -559,7 +559,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(String next
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ApplicationStackInner&gt; object
      */
@@ -577,7 +577,7 @@ public Page<ApplicationStackInner> call(ServiceResponse<Page<ApplicationStackInn
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-     * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+     * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ApplicationStackInner&gt; object
      */
@@ -599,7 +599,7 @@ public Observable<ServiceResponse<Page<ApplicationStackInner>>> call(ServiceResp
      * Get available application frameworks and their versions.
      * Get available application frameworks and their versions.
      *
-    ServiceResponse<PageImpl<ApplicationStackInner>> * @param osTypeSelected Possible values include: 'Windows', 'Linux'
+    ServiceResponse<PageImpl<ApplicationStackInner>> * @param osTypeSelected Possible values include: 'Windows', 'Linux', 'WindowsFunctions', 'LinuxFunctions'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ApplicationStackInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PublicCertificateImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PublicCertificateImpl.java
index 6a3e46227f99..407d32d4861c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PublicCertificateImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PublicCertificateImpl.java
@@ -14,12 +14,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.PublicCertificateLocation;
 
 class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, PublicCertificateInner, PublicCertificateImpl> implements PublicCertificate, PublicCertificate.Definition, PublicCertificate.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String publicCertificateName;
 
-    PublicCertificateImpl(String name, AppServiceManager manager) {
+    PublicCertificateImpl(String name, CertificateRegistrationManager manager) {
         super(name, new PublicCertificateInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, Pu
         //
     }
 
-    PublicCertificateImpl(PublicCertificateInner inner, AppServiceManager manager) {
+    PublicCertificateImpl(PublicCertificateInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class PublicCertificateImpl extends CreatableUpdatableImpl<PublicCertificate, Pu
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PushSettingsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PushSettingsImpl.java
index 8b405f1ebf91..bff38395f2e8 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PushSettingsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/PushSettingsImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class PushSettingsImpl extends WrapperImpl<PushSettingsInner> implements PushSettings {
-    private final AppServiceManager manager;
-    PushSettingsImpl(PushSettingsInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    PushSettingsImpl(PushSettingsInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationImpl.java
index 849129b556b3..453dfe86cb5a 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationImpl.java
@@ -20,15 +20,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ResourceScopeType;
 
 class RecommendationImpl extends WrapperImpl<RecommendationInner> implements Recommendation {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    RecommendationImpl(RecommendationInner inner,  AppServiceManager manager) {
+    RecommendationImpl(RecommendationInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationRuleImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationRuleImpl.java
index 1752f60f420a..2b06f2365388 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationRuleImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationRuleImpl.java
@@ -16,14 +16,14 @@
 import java.util.UUID;
 
 class RecommendationRuleImpl extends WrapperImpl<RecommendationRuleInner> implements RecommendationRule {
-    private final AppServiceManager manager;
-    RecommendationRuleImpl(RecommendationRuleInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    RecommendationRuleImpl(RecommendationRuleInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsImpl.java
index a182a21472aa..09897eae152c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsImpl.java
@@ -22,9 +22,9 @@
 
 class RecommendationsImpl extends WrapperImpl<RecommendationsInner> implements Recommendations {
     private PagedListConverter<RecommendationInner, Recommendation> converter;
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    RecommendationsImpl(AppServiceManager manager) {
+    RecommendationsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().recommendations());
         this.manager = manager;
         this.converter = new PagedListConverter<RecommendationInner, Recommendation>() {
@@ -35,7 +35,7 @@ public Observable<Recommendation> typeConvertAsync(RecommendationInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsInner.java
index 29e11f058890..3e508d09cfc5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RecommendationsInner.java
@@ -221,7 +221,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(Response<Resp
      * List all recommendations for a subscription.
      *
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -242,7 +242,7 @@ public Page<RecommendationInner> nextPage(String nextPageLink) {
      * List all recommendations for a subscription.
      *
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -264,7 +264,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(String nextPa
      * List all recommendations for a subscription.
      *
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -283,7 +283,7 @@ public Page<RecommendationInner> call(ServiceResponse<Page<RecommendationInner>>
      * List all recommendations for a subscription.
      *
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -306,7 +306,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(ServiceRespon
      * List all recommendations for a subscription.
      *
     ServiceResponse<PageImpl<RecommendationInner>> * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecommendationInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -625,7 +625,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(Response<Resp
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param expiredOnly Specify &lt;code&gt;false&lt;/code&gt; to return all recommendations. The default is &lt;code&gt;true&lt;/code&gt;, which returns only expired recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -648,7 +648,7 @@ public Page<RecommendationInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param expiredOnly Specify &lt;code&gt;false&lt;/code&gt; to return all recommendations. The default is &lt;code&gt;true&lt;/code&gt;, which returns only expired recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -672,7 +672,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(String nextPa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param expiredOnly Specify &lt;code&gt;false&lt;/code&gt; to return all recommendations. The default is &lt;code&gt;true&lt;/code&gt;, which returns only expired recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -693,7 +693,7 @@ public Page<RecommendationInner> call(ServiceResponse<Page<RecommendationInner>>
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param expiredOnly Specify &lt;code&gt;false&lt;/code&gt; to return all recommendations. The default is &lt;code&gt;true&lt;/code&gt;, which returns only expired recommendations.
-     * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+     * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -718,7 +718,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<RecommendationInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<RecommendationInner>> * @param siteName Name of the app.
     ServiceResponse<PageImpl<RecommendationInner>> * @param expiredOnly Specify &lt;code&gt;false&lt;/code&gt; to return all recommendations. The default is &lt;code&gt;true&lt;/code&gt;, which returns only expired recommendations.
-    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D]
+    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification' and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[PT1H|PT1M|P1D]
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecommendationInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -886,7 +886,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(Response<Resp
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'
+     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -909,7 +909,7 @@ public Page<RecommendationInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'
+     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -933,7 +933,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(String nextPa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'
+     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -954,7 +954,7 @@ public Page<RecommendationInner> call(ServiceResponse<Page<RecommendationInner>>
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param siteName Name of the app.
      * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'
+     * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecommendationInner&gt; object
      */
@@ -979,7 +979,7 @@ public Observable<ServiceResponse<Page<RecommendationInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<RecommendationInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<RecommendationInner>> * @param siteName Name of the app.
     ServiceResponse<PageImpl<RecommendationInner>> * @param featured Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical recommendations. The default is &lt;code&gt;false&lt;/code&gt;, which returns all recommendations.
-    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'
+    ServiceResponse<PageImpl<RecommendationInner>> * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channel eq 'Api' or channel eq 'Notification'
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecommendationInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RelayServiceConnectionEntityImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RelayServiceConnectionEntityImpl.java
index b5e9eba714e7..49151e38c986 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RelayServiceConnectionEntityImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RelayServiceConnectionEntityImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class RelayServiceConnectionEntityImpl extends WrapperImpl<RelayServiceConnectionEntityInner> implements RelayServiceConnectionEntity {
-    private final AppServiceManager manager;
-    RelayServiceConnectionEntityImpl(RelayServiceConnectionEntityInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    RelayServiceConnectionEntityImpl(RelayServiceConnectionEntityInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataImpl.java
new file mode 100644
index 000000000000..0cd10014315b
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataImpl.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadata;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class ResourceHealthMetadataImpl extends WrapperImpl<ResourceHealthMetadataInner> implements ResourceHealthMetadata {
+    private final CertificateRegistrationManager manager;
+    ResourceHealthMetadataImpl(ResourceHealthMetadataInner inner, CertificateRegistrationManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String category() {
+        return this.inner().category();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Boolean signalAvailability() {
+        return this.inner().signalAvailability();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataInner.java
new file mode 100644
index 000000000000..fd288dbd36f2
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadataInner.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.management.appservice.v2018_02_01.ProxyOnlyResource;
+
+/**
+ * Used for getting ResourceHealthCheck settings.
+ */
+@JsonFlatten
+public class ResourceHealthMetadataInner extends ProxyOnlyResource {
+    /**
+     * The category that the resource matches in the RHC Policy File.
+     */
+    @JsonProperty(value = "properties.category")
+    private String category;
+
+    /**
+     * Is there a health signal for the resource.
+     */
+    @JsonProperty(value = "properties.signalAvailability")
+    private Boolean signalAvailability;
+
+    /**
+     * Get the category that the resource matches in the RHC Policy File.
+     *
+     * @return the category value
+     */
+    public String category() {
+        return this.category;
+    }
+
+    /**
+     * Set the category that the resource matches in the RHC Policy File.
+     *
+     * @param category the category value to set
+     * @return the ResourceHealthMetadataInner object itself.
+     */
+    public ResourceHealthMetadataInner withCategory(String category) {
+        this.category = category;
+        return this;
+    }
+
+    /**
+     * Get is there a health signal for the resource.
+     *
+     * @return the signalAvailability value
+     */
+    public Boolean signalAvailability() {
+        return this.signalAvailability;
+    }
+
+    /**
+     * Set is there a health signal for the resource.
+     *
+     * @param signalAvailability the signalAvailability value to set
+     * @return the ResourceHealthMetadataInner object itself.
+     */
+    public ResourceHealthMetadataInner withSignalAvailability(Boolean signalAvailability) {
+        this.signalAvailability = signalAvailability;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasImpl.java
new file mode 100644
index 000000000000..fee8abd0c849
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasImpl.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadata;
+
+class ResourceHealthMetadatasImpl extends WrapperImpl<ResourceHealthMetadatasInner> implements ResourceHealthMetadatas {
+    private final CertificateRegistrationManager manager;
+
+    ResourceHealthMetadatasImpl(CertificateRegistrationManager manager) {
+        super(manager.inner().resourceHealthMetadatas());
+        this.manager = manager;
+    }
+
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> listBySiteAsync(final String resourceGroupName, final String name) {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.listBySiteAsync(resourceGroupName, name)
+        .flatMapIterable(new Func1<Page<ResourceHealthMetadataInner>, Iterable<ResourceHealthMetadataInner>>() {
+            @Override
+            public Iterable<ResourceHealthMetadataInner> call(Page<ResourceHealthMetadataInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> getBySiteAsync(String resourceGroupName, String name) {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.getBySiteAsync(resourceGroupName, name)
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> listAsync() {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<ResourceHealthMetadataInner>, Iterable<ResourceHealthMetadataInner>>() {
+            @Override
+            public Iterable<ResourceHealthMetadataInner> call(Page<ResourceHealthMetadataInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> listByResourceGroupAsync(final String resourceGroupName) {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<ResourceHealthMetadataInner>, Iterable<ResourceHealthMetadataInner>>() {
+            @Override
+            public Iterable<ResourceHealthMetadataInner> call(Page<ResourceHealthMetadataInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> listBySiteSlotAsync(final String resourceGroupName, final String name, final String slot) {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.listBySiteSlotAsync(resourceGroupName, name, slot)
+        .flatMapIterable(new Func1<Page<ResourceHealthMetadataInner>, Iterable<ResourceHealthMetadataInner>>() {
+            @Override
+            public Iterable<ResourceHealthMetadataInner> call(Page<ResourceHealthMetadataInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ResourceHealthMetadata> getBySiteSlotAsync(String resourceGroupName, String name, String slot) {
+        ResourceHealthMetadatasInner client = this.inner();
+        return client.getBySiteSlotAsync(resourceGroupName, name, slot)
+        .map(new Func1<ResourceHealthMetadataInner, ResourceHealthMetadata>() {
+            @Override
+            public ResourceHealthMetadata call(ResourceHealthMetadataInner inner) {
+                return new ResourceHealthMetadataImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasInner.java
new file mode 100644
index 000000000000..040cd5f0e0ca
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ResourceHealthMetadatasInner.java
@@ -0,0 +1,1250 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.appservice.v2018_02_01.DefaultErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ResourceHealthMetadatas.
+ */
+public class ResourceHealthMetadatasInner implements InnerSupportsListing<ResourceHealthMetadataInner> {
+    /** The Retrofit service to perform REST calls. */
+    private ResourceHealthMetadatasService service;
+    /** The service client containing this operation class. */
+    private WebSiteManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ResourceHealthMetadatasInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ResourceHealthMetadatasInner(Retrofit retrofit, WebSiteManagementClientImpl client) {
+        this.service = retrofit.create(ResourceHealthMetadatasService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ResourceHealthMetadatas to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ResourceHealthMetadatasService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/resourceHealthMetadata")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/resourceHealthMetadata")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listBySite" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata")
+        Observable<Response<ResponseBody>> listBySite(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas getBySite" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resourceHealthMetadata/default")
+        Observable<Response<ResponseBody>> getBySite(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listBySiteSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata")
+        Observable<Response<ResponseBody>> listBySiteSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas getBySiteSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resourceHealthMetadata/default")
+        Observable<Response<ResponseBody>> getBySiteSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listBySiteNext" })
+        @GET
+        Observable<Response<ResponseBody>> listBySiteNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.ResourceHealthMetadatas listBySiteSlotNext" })
+        @GET
+        Observable<Response<ResponseBody>> listBySiteSlotNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> list() {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @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<List<ResourceHealthMetadataInner>> listAsync(final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @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<List<ResourceHealthMetadataInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listBySite(final String resourceGroupName, final String name) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listBySiteSinglePageAsync(resourceGroupName, name).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listBySiteNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @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<List<ResourceHealthMetadataInner>> listBySiteAsync(final String resourceGroupName, final String name, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySiteSinglePageAsync(resourceGroupName, name),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listBySiteNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listBySiteAsync(final String resourceGroupName, final String name) {
+        return listBySiteWithServiceResponseAsync(resourceGroupName, name)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteWithServiceResponseAsync(final String resourceGroupName, final String name) {
+        return listBySiteSinglePageAsync(resourceGroupName, name)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySiteNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param name Name of web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteSinglePageAsync(final String resourceGroupName, final String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listBySite(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listBySiteDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listBySiteDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceHealthMetadataInner object if successful.
+     */
+    public ResourceHealthMetadataInner getBySite(String resourceGroupName, String name) {
+        return getBySiteWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @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<ResourceHealthMetadataInner> getBySiteAsync(String resourceGroupName, String name, final ServiceCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBySiteWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceHealthMetadataInner object
+     */
+    public Observable<ResourceHealthMetadataInner> getBySiteAsync(String resourceGroupName, String name) {
+        return getBySiteWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<ResourceHealthMetadataInner>, ResourceHealthMetadataInner>() {
+            @Override
+            public ResourceHealthMetadataInner call(ServiceResponse<ResourceHealthMetadataInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceHealthMetadataInner object
+     */
+    public Observable<ServiceResponse<ResourceHealthMetadataInner>> getBySiteWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getBySite(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceHealthMetadataInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceHealthMetadataInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceHealthMetadataInner> clientResponse = getBySiteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceHealthMetadataInner> getBySiteDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceHealthMetadataInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceHealthMetadataInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listBySiteSlot(final String resourceGroupName, final String name, final String slot) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listBySiteSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listBySiteSlotNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @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<List<ResourceHealthMetadataInner>> listBySiteSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySiteSlotSinglePageAsync(resourceGroupName, name, slot),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listBySiteSlotNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listBySiteSlotAsync(final String resourceGroupName, final String name, final String slot) {
+        return listBySiteSlotWithServiceResponseAsync(resourceGroupName, name, slot)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app.
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) {
+        return listBySiteSlotSinglePageAsync(resourceGroupName, name, slot)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySiteSlotNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param name Name of web app.
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listBySiteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listBySiteSlotDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listBySiteSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ResourceHealthMetadataInner object if successful.
+     */
+    public ResourceHealthMetadataInner getBySiteSlot(String resourceGroupName, String name, String slot) {
+        return getBySiteSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @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<ResourceHealthMetadataInner> getBySiteSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBySiteSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceHealthMetadataInner object
+     */
+    public Observable<ResourceHealthMetadataInner> getBySiteSlotAsync(String resourceGroupName, String name, String slot) {
+        return getBySiteSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<ResourceHealthMetadataInner>, ResourceHealthMetadataInner>() {
+            @Override
+            public ResourceHealthMetadataInner call(ServiceResponse<ResourceHealthMetadataInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     * Gets the category of ResourceHealthMetadata to use for the given site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of web app
+     * @param slot Name of web app slot. If not specified then will default to production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ResourceHealthMetadataInner object
+     */
+    public Observable<ServiceResponse<ResourceHealthMetadataInner>> getBySiteSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getBySiteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ResourceHealthMetadataInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ResourceHealthMetadataInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ResourceHealthMetadataInner> clientResponse = getBySiteSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ResourceHealthMetadataInner> getBySiteSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ResourceHealthMetadataInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ResourceHealthMetadataInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ResourceHealthMetadataInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<ResourceHealthMetadataInner>> serviceFuture, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     * List all ResourceHealthMetadata for all sites in the subscription.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ResourceHealthMetadataInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<ResourceHealthMetadataInner>> serviceFuture, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     * List all ResourceHealthMetadata for all sites in the resource group in the subscription.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listByResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listBySiteNext(final String nextPageLink) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listBySiteNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listBySiteNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ResourceHealthMetadataInner>> listBySiteNextAsync(final String nextPageLink, final ServiceFuture<List<ResourceHealthMetadataInner>> serviceFuture, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySiteNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listBySiteNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listBySiteNextAsync(final String nextPageLink) {
+        return listBySiteNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteNextWithServiceResponseAsync(final String nextPageLink) {
+        return listBySiteNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySiteNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listBySiteNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listBySiteNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listBySiteNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object if successful.
+     */
+    public PagedList<ResourceHealthMetadataInner> listBySiteSlotNext(final String nextPageLink) {
+        ServiceResponse<Page<ResourceHealthMetadataInner>> response = listBySiteSlotNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ResourceHealthMetadataInner>(response.body()) {
+            @Override
+            public Page<ResourceHealthMetadataInner> nextPage(String nextPageLink) {
+                return listBySiteSlotNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ResourceHealthMetadataInner>> listBySiteSlotNextAsync(final String nextPageLink, final ServiceFuture<List<ResourceHealthMetadataInner>> serviceFuture, final ListOperationCallback<ResourceHealthMetadataInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBySiteSlotNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(String nextPageLink) {
+                    return listBySiteSlotNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<Page<ResourceHealthMetadataInner>> listBySiteSlotNextAsync(final String nextPageLink) {
+        return listBySiteSlotNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Page<ResourceHealthMetadataInner>>() {
+                @Override
+                public Page<ResourceHealthMetadataInner> call(ServiceResponse<Page<ResourceHealthMetadataInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ResourceHealthMetadataInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteSlotNextWithServiceResponseAsync(final String nextPageLink) {
+        return listBySiteSlotNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ResourceHealthMetadataInner>>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(ServiceResponse<Page<ResourceHealthMetadataInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBySiteSlotNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     * Gets the category of ResourceHealthMetadata to use for the given site as a collection.
+     *
+    ServiceResponse<PageImpl<ResourceHealthMetadataInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ResourceHealthMetadataInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> listBySiteSlotNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listBySiteSlotNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ResourceHealthMetadataInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ResourceHealthMetadataInner>> result = listBySiteSlotNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ResourceHealthMetadataInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ResourceHealthMetadataInner>> listBySiteSlotNextDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceHealthMetadataInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceHealthMetadataInner>>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RestoreRequestImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RestoreRequestImpl.java
index 436396bac0c8..b07de0571eaa 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RestoreRequestImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/RestoreRequestImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.BackupRestoreOperationType;
 
 class RestoreRequestImpl extends WrapperImpl<RestoreRequestInner> implements RestoreRequest {
-    private final AppServiceManager manager;
-    RestoreRequestImpl(RestoreRequestInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    RestoreRequestImpl(RestoreRequestInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmCsmUsageQuotaImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmCsmUsageQuotaImpl.java
index 0d0a73177b89..bae7e8231180 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmCsmUsageQuotaImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmCsmUsageQuotaImpl.java
@@ -15,15 +15,15 @@
 import org.joda.time.DateTime;
 
 class ServerfarmCsmUsageQuotaImpl extends WrapperImpl<CsmUsageQuotaInner> implements ServerfarmCsmUsageQuota {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    ServerfarmCsmUsageQuotaImpl(CsmUsageQuotaInner inner,  AppServiceManager manager) {
+    ServerfarmCsmUsageQuotaImpl(CsmUsageQuotaInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmHybridConnectionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmHybridConnectionImpl.java
index e0bf060611f3..f54f159c30cf 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmHybridConnectionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmHybridConnectionImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class ServerfarmHybridConnectionImpl extends IndexableRefreshableWrapperImpl<ServerfarmHybridConnection, HybridConnectionInner> implements ServerfarmHybridConnection {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String namespaceName;
     private String relayName;
 
-    ServerfarmHybridConnectionImpl(HybridConnectionInner inner,  AppServiceManager manager) {
+    ServerfarmHybridConnectionImpl(HybridConnectionInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -29,7 +29,7 @@ class ServerfarmHybridConnectionImpl extends IndexableRefreshableWrapperImpl<Ser
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricDefinitionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricDefinitionImpl.java
index 4e32e98bf309..f4de17e6cc04 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricDefinitionImpl.java
@@ -16,15 +16,15 @@
 import java.util.Map;
 
 class ServerfarmResourceMetricDefinitionImpl extends WrapperImpl<ResourceMetricDefinitionInner> implements ServerfarmResourceMetricDefinition {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    ServerfarmResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  AppServiceManager manager) {
+    ServerfarmResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricImpl.java
index 02f47d3e334e..f0f3e28e188d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ResourceMetricProperty;
 
 class ServerfarmResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements ServerfarmResourceMetric {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    ServerfarmResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    ServerfarmResourceMetricImpl(ResourceMetricInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmSiteImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmSiteImpl.java
index d473580dd28f..d689b560c006 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmSiteImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmSiteImpl.java
@@ -20,20 +20,19 @@
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotSwapStatus;
-import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRecoveryRequest;
 import java.util.Map;
 import com.microsoft.azure.management.appservice.v2018_02_01.UsageState;
 
 class ServerfarmSiteImpl extends WrapperImpl<SiteInner> implements ServerfarmSite {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    ServerfarmSiteImpl(SiteInner inner,  AppServiceManager manager) {
+    ServerfarmSiteImpl(SiteInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -109,6 +108,11 @@ public Boolean httpsOnly() {
         return this.inner().httpsOnly();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public String id() {
         return this.inner().id();
@@ -199,11 +203,6 @@ public SlotSwapStatus slotSwapStatus() {
         return this.inner().slotSwapStatus();
     }
 
-    @Override
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.inner().snapshotInfo();
-    }
-
     @Override
     public String state() {
         return this.inner().state();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetGatewayImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetGatewayImpl.java
index b7ae57967f07..be6800c70595 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetGatewayImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetGatewayImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class ServerfarmVnetGatewayImpl extends CreatableUpdatableImpl<ServerfarmVnetGateway, VnetGatewayInner, ServerfarmVnetGatewayImpl> implements ServerfarmVnetGateway, ServerfarmVnetGateway.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String gatewayName;
 
-    ServerfarmVnetGatewayImpl(String name, AppServiceManager manager) {
+    ServerfarmVnetGatewayImpl(String name, CertificateRegistrationManager manager) {
         super(name, new VnetGatewayInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class ServerfarmVnetGatewayImpl extends CreatableUpdatableImpl<ServerfarmVnetGat
         //
     }
 
-    ServerfarmVnetGatewayImpl(VnetGatewayInner inner, AppServiceManager manager) {
+    ServerfarmVnetGatewayImpl(VnetGatewayInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -41,7 +41,7 @@ class ServerfarmVnetGatewayImpl extends CreatableUpdatableImpl<ServerfarmVnetGat
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetInfoImpl.java
index 6a9b9a43113d..85b9462df550 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/ServerfarmVnetInfoImpl.java
@@ -16,12 +16,12 @@
 import java.util.List;
 
 class ServerfarmVnetInfoImpl extends IndexableRefreshableWrapperImpl<ServerfarmVnetInfo, VnetInfoInner> implements ServerfarmVnetInfo {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
 
-    ServerfarmVnetInfoImpl(VnetInfoInner inner,  AppServiceManager manager) {
+    ServerfarmVnetInfoImpl(VnetInfoInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -30,7 +30,7 @@ class ServerfarmVnetInfoImpl extends IndexableRefreshableWrapperImpl<ServerfarmV
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteAuthSettingsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteAuthSettingsImpl.java
index 1b920aea4235..2f3c3673fe88 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteAuthSettingsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteAuthSettingsImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.UnauthenticatedClientAction;
 
 class SiteAuthSettingsImpl extends WrapperImpl<SiteAuthSettingsInner> implements SiteAuthSettings {
-    private final AppServiceManager manager;
-    SiteAuthSettingsImpl(SiteAuthSettingsInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteAuthSettingsImpl(SiteAuthSettingsInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCloneabilityImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCloneabilityImpl.java
index 61d2ff402a84..6781bd3d9dbe 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCloneabilityImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCloneabilityImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.CloneAbilityResult;
 
 class SiteCloneabilityImpl extends WrapperImpl<SiteCloneabilityInner> implements SiteCloneability {
-    private final AppServiceManager manager;
-    SiteCloneabilityImpl(SiteCloneabilityInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteCloneabilityImpl(SiteCloneabilityInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceImpl.java
index 1027a44381ef..65f6282a6090 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceImpl.java
@@ -14,6 +14,8 @@
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2018_02_01.NameValuePair;
 import com.microsoft.azure.management.appservice.v2018_02_01.AutoHealRules;
+import java.util.Map;
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStorageInfoValue;
 import com.microsoft.azure.management.appservice.v2018_02_01.ConnStringInfo;
 import com.microsoft.azure.management.appservice.v2018_02_01.CorsSettings;
 import com.microsoft.azure.management.appservice.v2018_02_01.Experiments;
@@ -30,14 +32,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.VirtualApplication;
 
 class SiteConfigResourceImpl extends WrapperImpl<SiteConfigResourceInner> implements SiteConfigResource {
-    private final AppServiceManager manager;
-    SiteConfigResourceImpl(SiteConfigResourceInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteConfigResourceImpl(SiteConfigResourceInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -76,6 +78,11 @@ public String autoSwapSlotName() {
         return this.inner().autoSwapSlotName();
     }
 
+    @Override
+    public Map<String, AzureStorageInfoValue> azureStorageAccounts() {
+        return this.inner().azureStorageAccounts();
+    }
+
     @Override
     public List<ConnStringInfo> connectionStrings() {
         return this.inner().connectionStrings();
@@ -261,6 +268,11 @@ public DateTime requestTracingExpirationTime() {
         return this.inner().requestTracingExpirationTime();
     }
 
+    @Override
+    public Integer reservedInstanceCount() {
+        return this.inner().reservedInstanceCount();
+    }
+
     @Override
     public ScmType scmType() {
         return this.inner().scmType();
@@ -297,8 +309,8 @@ public Boolean webSocketsEnabled() {
     }
 
     @Override
-    public String xenonFxVersion() {
-        return this.inner().xenonFxVersion();
+    public String windowsFxVersion() {
+        return this.inner().windowsFxVersion();
     }
 
     @Override
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceInner.java
index d1a8d041b84f..647109a1712d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigResourceInner.java
@@ -11,6 +11,8 @@
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2018_02_01.NameValuePair;
+import java.util.Map;
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStorageInfoValue;
 import com.microsoft.azure.management.appservice.v2018_02_01.ConnStringInfo;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteMachineKey;
 import com.microsoft.azure.management.appservice.v2018_02_01.HandlerMapping;
@@ -80,8 +82,8 @@ public class SiteConfigResourceInner extends ProxyOnlyResource {
     /**
      * Xenon App Framework and version.
      */
-    @JsonProperty(value = "properties.xenonFxVersion")
-    private String xenonFxVersion;
+    @JsonProperty(value = "properties.windowsFxVersion")
+    private String windowsFxVersion;
 
     /**
      * &lt;code&gt;true&lt;/code&gt; if request tracing is enabled; otherwise,
@@ -141,6 +143,12 @@ public class SiteConfigResourceInner extends ProxyOnlyResource {
     @JsonProperty(value = "properties.appSettings")
     private List<NameValuePair> appSettings;
 
+    /**
+     * User-provided Azure storage accounts.
+     */
+    @JsonProperty(value = "properties.azureStorageAccounts")
+    private Map<String, AzureStorageInfoValue> azureStorageAccounts;
+
     /**
      * Connection strings.
      */
@@ -345,6 +353,13 @@ public class SiteConfigResourceInner extends ProxyOnlyResource {
     @JsonProperty(value = "properties.ftpsState")
     private FtpsState ftpsState;
 
+    /**
+     * Number of reserved instances.
+     * This setting only applies to the Consumption Plan.
+     */
+    @JsonProperty(value = "properties.reservedInstanceCount")
+    private Integer reservedInstanceCount;
+
     /**
      * Get number of workers.
      *
@@ -488,20 +503,20 @@ public SiteConfigResourceInner withLinuxFxVersion(String linuxFxVersion) {
     /**
      * Get xenon App Framework and version.
      *
-     * @return the xenonFxVersion value
+     * @return the windowsFxVersion value
      */
-    public String xenonFxVersion() {
-        return this.xenonFxVersion;
+    public String windowsFxVersion() {
+        return this.windowsFxVersion;
     }
 
     /**
      * Set xenon App Framework and version.
      *
-     * @param xenonFxVersion the xenonFxVersion value to set
+     * @param windowsFxVersion the windowsFxVersion value to set
      * @return the SiteConfigResourceInner object itself.
      */
-    public SiteConfigResourceInner withXenonFxVersion(String xenonFxVersion) {
-        this.xenonFxVersion = xenonFxVersion;
+    public SiteConfigResourceInner withWindowsFxVersion(String windowsFxVersion) {
+        this.windowsFxVersion = windowsFxVersion;
         return this;
     }
 
@@ -685,6 +700,26 @@ public SiteConfigResourceInner withAppSettings(List<NameValuePair> appSettings)
         return this;
     }
 
+    /**
+     * Get user-provided Azure storage accounts.
+     *
+     * @return the azureStorageAccounts value
+     */
+    public Map<String, AzureStorageInfoValue> azureStorageAccounts() {
+        return this.azureStorageAccounts;
+    }
+
+    /**
+     * Set user-provided Azure storage accounts.
+     *
+     * @param azureStorageAccounts the azureStorageAccounts value to set
+     * @return the SiteConfigResourceInner object itself.
+     */
+    public SiteConfigResourceInner withAzureStorageAccounts(Map<String, AzureStorageInfoValue> azureStorageAccounts) {
+        this.azureStorageAccounts = azureStorageAccounts;
+        return this;
+    }
+
     /**
      * Get connection strings.
      *
@@ -1314,4 +1349,26 @@ public SiteConfigResourceInner withFtpsState(FtpsState ftpsState) {
         return this;
     }
 
+    /**
+     * Get number of reserved instances.
+     This setting only applies to the Consumption Plan.
+     *
+     * @return the reservedInstanceCount value
+     */
+    public Integer reservedInstanceCount() {
+        return this.reservedInstanceCount;
+    }
+
+    /**
+     * Set number of reserved instances.
+     This setting only applies to the Consumption Plan.
+     *
+     * @param reservedInstanceCount the reservedInstanceCount value to set
+     * @return the SiteConfigResourceInner object itself.
+     */
+    public SiteConfigResourceInner withReservedInstanceCount(Integer reservedInstanceCount) {
+        this.reservedInstanceCount = reservedInstanceCount;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigurationSnapshotInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigurationSnapshotInfoImpl.java
index 116343cb3b0f..885e7ff958eb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigurationSnapshotInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteConfigurationSnapshotInfoImpl.java
@@ -13,14 +13,14 @@
 import org.joda.time.DateTime;
 
 class SiteConfigurationSnapshotInfoImpl extends WrapperImpl<SiteConfigurationSnapshotInfoInner> implements SiteConfigurationSnapshotInfo {
-    private final AppServiceManager manager;
-    SiteConfigurationSnapshotInfoImpl(SiteConfigurationSnapshotInfoInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteConfigurationSnapshotInfoImpl(SiteConfigurationSnapshotInfoInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCsmUsageQuotaImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCsmUsageQuotaImpl.java
index 0e06d65c3839..c294ac458319 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCsmUsageQuotaImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteCsmUsageQuotaImpl.java
@@ -15,15 +15,15 @@
 import org.joda.time.DateTime;
 
 class SiteCsmUsageQuotaImpl extends WrapperImpl<CsmUsageQuotaInner> implements SiteCsmUsageQuota {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    SiteCsmUsageQuotaImpl(CsmUsageQuotaInner inner,  AppServiceManager manager) {
+    SiteCsmUsageQuotaImpl(CsmUsageQuotaInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteExtensionInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteExtensionInfoImpl.java
index 005e4ba5cbb9..5f68793e272d 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteExtensionInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteExtensionInfoImpl.java
@@ -16,12 +16,12 @@
 import org.joda.time.DateTime;
 
 class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, SiteExtensionInfoInner, SiteExtensionInfoImpl> implements SiteExtensionInfo, SiteExtensionInfo.Definition, SiteExtensionInfo.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String siteExtensionId;
 
-    SiteExtensionInfoImpl(String name, AppServiceManager manager) {
+    SiteExtensionInfoImpl(String name, CertificateRegistrationManager manager) {
         super(name, new SiteExtensionInfoInner());
         this.manager = manager;
         // Set resource name
@@ -29,7 +29,7 @@ class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, Si
         //
     }
 
-    SiteExtensionInfoImpl(SiteExtensionInfoInner inner, AppServiceManager manager) {
+    SiteExtensionInfoImpl(SiteExtensionInfoInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class SiteExtensionInfoImpl extends CreatableUpdatableImpl<SiteExtensionInfo, Si
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteHybridConnectionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteHybridConnectionImpl.java
index 6458aa7ba745..813a8f2a1ac9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteHybridConnectionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteHybridConnectionImpl.java
@@ -13,13 +13,13 @@
 import rx.Observable;
 
 class SiteHybridConnectionImpl extends CreatableUpdatableImpl<SiteHybridConnection, HybridConnectionInner, SiteHybridConnectionImpl> implements SiteHybridConnection, SiteHybridConnection.Definition, SiteHybridConnection.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String namespaceName;
     private String relayName;
 
-    SiteHybridConnectionImpl(String name, AppServiceManager manager) {
+    SiteHybridConnectionImpl(String name, CertificateRegistrationManager manager) {
         super(name, new HybridConnectionInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class SiteHybridConnectionImpl extends CreatableUpdatableImpl<SiteHybridConnecti
         //
     }
 
-    SiteHybridConnectionImpl(HybridConnectionInner inner, AppServiceManager manager) {
+    SiteHybridConnectionImpl(HybridConnectionInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -41,7 +41,7 @@ class SiteHybridConnectionImpl extends CreatableUpdatableImpl<SiteHybridConnecti
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInner.java
index b0ca24374bc9..4b1ceb1c12b2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInner.java
@@ -16,7 +16,6 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.HostingEnvironmentProfile;
 import com.microsoft.azure.management.appservice.v2018_02_01.CloningInfo;
-import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRecoveryRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotSwapStatus;
 import com.microsoft.azure.management.appservice.v2018_02_01.ManagedServiceIdentity;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -98,11 +97,17 @@ public class SiteInner extends Resource {
     private Boolean reserved;
 
     /**
-     * Hyper-V sandbox.
+     * Obsolete: Hyper-V sandbox.
      */
     @JsonProperty(value = "properties.isXenon")
     private Boolean isXenon;
 
+    /**
+     * Hyper-V sandbox.
+     */
+    @JsonProperty(value = "properties.hyperV")
+    private Boolean hyperV;
+
     /**
      * Last time the app was modified, in UTC. Read-only.
      */
@@ -215,13 +220,6 @@ public class SiteInner extends Resource {
     @JsonProperty(value = "properties.cloningInfo")
     private CloningInfo cloningInfo;
 
-    /**
-     * If specified during app creation, the app is created from a previous
-     * snapshot.
-     */
-    @JsonProperty(value = "properties.snapshotInfo")
-    private SnapshotRecoveryRequest snapshotInfo;
-
     /**
      * Name of the resource group the app belongs to. Read-only.
      */
@@ -403,7 +401,7 @@ public SiteInner withReserved(Boolean reserved) {
     }
 
     /**
-     * Get hyper-V sandbox.
+     * Get obsolete: Hyper-V sandbox.
      *
      * @return the isXenon value
      */
@@ -412,7 +410,7 @@ public Boolean isXenon() {
     }
 
     /**
-     * Set hyper-V sandbox.
+     * Set obsolete: Hyper-V sandbox.
      *
      * @param isXenon the isXenon value to set
      * @return the SiteInner object itself.
@@ -422,6 +420,26 @@ public SiteInner withIsXenon(Boolean isXenon) {
         return this;
     }
 
+    /**
+     * Get hyper-V sandbox.
+     *
+     * @return the hyperV value
+     */
+    public Boolean hyperV() {
+        return this.hyperV;
+    }
+
+    /**
+     * Set hyper-V sandbox.
+     *
+     * @param hyperV the hyperV value to set
+     * @return the SiteInner object itself.
+     */
+    public SiteInner withHyperV(Boolean hyperV) {
+        this.hyperV = hyperV;
+        return this;
+    }
+
     /**
      * Get last time the app was modified, in UTC. Read-only.
      *
@@ -668,26 +686,6 @@ public SiteInner withCloningInfo(CloningInfo cloningInfo) {
         return this;
     }
 
-    /**
-     * Get if specified during app creation, the app is created from a previous snapshot.
-     *
-     * @return the snapshotInfo value
-     */
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.snapshotInfo;
-    }
-
-    /**
-     * Set if specified during app creation, the app is created from a previous snapshot.
-     *
-     * @param snapshotInfo the snapshotInfo value to set
-     * @return the SiteInner object itself.
-     */
-    public SiteInner withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo) {
-        this.snapshotInfo = snapshotInfo;
-        return this;
-    }
-
     /**
      * Get name of the resource group the app belongs to. Read-only.
      *
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInstanceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInstanceImpl.java
index 0c03c371c8d1..aa957a98d9e2 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInstanceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteInstanceImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class SiteInstanceImpl extends WrapperImpl<SiteInstanceInner> implements SiteInstance {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    SiteInstanceImpl(SiteInstanceInner inner,  AppServiceManager manager) {
+    SiteInstanceImpl(SiteInstanceInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteLogsConfigImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteLogsConfigImpl.java
index 2ac02fed45b3..ddc905b2fe7b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteLogsConfigImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteLogsConfigImpl.java
@@ -15,14 +15,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.HttpLogsConfig;
 
 class SiteLogsConfigImpl extends WrapperImpl<SiteLogsConfigInner> implements SiteLogsConfig {
-    private final AppServiceManager manager;
-    SiteLogsConfigImpl(SiteLogsConfigInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteLogsConfigImpl(SiteLogsConfigInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitePhpErrorLogFlagImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitePhpErrorLogFlagImpl.java
index a8294e8ce263..6ef330c301d9 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitePhpErrorLogFlagImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitePhpErrorLogFlagImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SitePhpErrorLogFlagImpl extends WrapperImpl<SitePhpErrorLogFlagInner> implements SitePhpErrorLogFlag {
-    private final AppServiceManager manager;
-    SitePhpErrorLogFlagImpl(SitePhpErrorLogFlagInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SitePhpErrorLogFlagImpl(SitePhpErrorLogFlagInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricDefinitionImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricDefinitionImpl.java
index b2384cb53582..041f99984d79 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricDefinitionImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricDefinitionImpl.java
@@ -16,15 +16,15 @@
 import java.util.Map;
 
 class SiteResourceMetricDefinitionImpl extends WrapperImpl<ResourceMetricDefinitionInner> implements SiteResourceMetricDefinition {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    SiteResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  AppServiceManager manager) {
+    SiteResourceMetricDefinitionImpl(ResourceMetricDefinitionInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricImpl.java
index 1a1ca9b83b43..45ebe40fda10 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteResourceMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.ResourceMetricProperty;
 
 class SiteResourceMetricImpl extends WrapperImpl<ResourceMetricInner> implements SiteResourceMetric {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    SiteResourceMetricImpl(ResourceMetricInner inner,  AppServiceManager manager) {
+    SiteResourceMetricImpl(ResourceMetricInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSealImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSealImpl.java
index a1bb7fe9b215..604976c57b15 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSealImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSealImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SiteSealImpl extends WrapperImpl<SiteSealInner> implements SiteSeal {
-    private final AppServiceManager manager;
-    SiteSealImpl(SiteSealInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteSealImpl(SiteSealInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSourceControlImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSourceControlImpl.java
index ea024b009c6e..e282ab4a112c 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSourceControlImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteSourceControlImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SiteSourceControlImpl extends WrapperImpl<SiteSourceControlInner> implements SiteSourceControl {
-    private final AppServiceManager manager;
-    SiteSourceControlImpl(SiteSourceControlInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SiteSourceControlImpl(SiteSourceControlInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetGatewayImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetGatewayImpl.java
index 6c43acd2c66a..acc0c193dc53 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetGatewayImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetGatewayImpl.java
@@ -13,14 +13,14 @@
 import rx.Observable;
 
 class SiteVnetGatewayImpl extends CreatableUpdatableImpl<SiteVnetGateway, VnetGatewayInner, SiteVnetGatewayImpl> implements SiteVnetGateway, SiteVnetGateway.Definition, SiteVnetGateway.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String gatewayName;
     private String slot;
 
-    SiteVnetGatewayImpl(String name, AppServiceManager manager) {
+    SiteVnetGatewayImpl(String name, CertificateRegistrationManager manager) {
         super(name, new VnetGatewayInner());
         this.manager = manager;
         // Set resource name
@@ -28,7 +28,7 @@ class SiteVnetGatewayImpl extends CreatableUpdatableImpl<SiteVnetGateway, VnetGa
         //
     }
 
-    SiteVnetGatewayImpl(VnetGatewayInner inner, AppServiceManager manager) {
+    SiteVnetGatewayImpl(VnetGatewayInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -43,7 +43,7 @@ class SiteVnetGatewayImpl extends CreatableUpdatableImpl<SiteVnetGateway, VnetGa
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetInfoImpl.java
index b4afef2a1b63..6b5dadca1cf4 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SiteVnetInfoImpl.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.VnetRoute;
 
 class SiteVnetInfoImpl extends CreatableUpdatableImpl<SiteVnetInfo, VnetInfoInner, SiteVnetInfoImpl> implements SiteVnetInfo, SiteVnetInfo.Definition, SiteVnetInfo.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String slot;
 
-    SiteVnetInfoImpl(String name, AppServiceManager manager) {
+    SiteVnetInfoImpl(String name, CertificateRegistrationManager manager) {
         super(name, new VnetInfoInner());
         this.manager = manager;
         // Set resource name
@@ -30,7 +30,7 @@ class SiteVnetInfoImpl extends CreatableUpdatableImpl<SiteVnetInfo, VnetInfoInne
         //
     }
 
-    SiteVnetInfoImpl(VnetInfoInner inner, AppServiceManager manager) {
+    SiteVnetInfoImpl(VnetInfoInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -44,7 +44,7 @@ class SiteVnetInfoImpl extends CreatableUpdatableImpl<SiteVnetInfo, VnetInfoInne
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitesImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitesImpl.java
index 61faa257588f..56d6c484cee7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitesImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SitesImpl.java
@@ -20,14 +20,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.HostingEnvironmentProfile;
 import com.microsoft.azure.management.appservice.v2018_02_01.CloningInfo;
-import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRecoveryRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotSwapStatus;
 import com.microsoft.azure.management.appservice.v2018_02_01.ManagedServiceIdentity;
 import rx.functions.Func1;
 
-class SitesImpl extends GroupableResourceCoreImpl<Sites, SiteInner, SitesImpl, AppServiceManager> implements Sites, Sites.Definition, Sites.Update {
+class SitesImpl extends GroupableResourceCoreImpl<Sites, SiteInner, SitesImpl, CertificateRegistrationManager> implements Sites, Sites.Definition, Sites.Update {
     private SitePatchResource updateParameter;
-    SitesImpl(String name, SiteInner inner, AppServiceManager manager) {
+    SitesImpl(String name, SiteInner inner, CertificateRegistrationManager manager) {
         super(name, inner, manager);
         this.updateParameter = new SitePatchResource();
     }
@@ -145,6 +144,11 @@ public Boolean httpsOnly() {
         return this.inner().httpsOnly();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public ManagedServiceIdentity identity() {
         return this.inner().identity();
@@ -220,11 +224,6 @@ public SlotSwapStatus slotSwapStatus() {
         return this.inner().slotSwapStatus();
     }
 
-    @Override
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.inner().snapshotInfo();
-    }
-
     @Override
     public String state() {
         return this.inner().state();
@@ -356,6 +355,16 @@ public SitesImpl withHttpsOnly(Boolean httpsOnly) {
         return this;
     }
 
+    @Override
+    public SitesImpl withHyperV(Boolean hyperV) {
+        if (isInCreateMode()) {
+            this.inner().withHyperV(hyperV);
+        } else {
+            this.updateParameter.withHyperV(hyperV);
+        }
+        return this;
+    }
+
     @Override
     public SitesImpl withIsXenon(Boolean isXenon) {
         if (isInCreateMode()) {
@@ -416,14 +425,4 @@ public SitesImpl withSiteConfig(SiteConfig siteConfig) {
         return this;
     }
 
-    @Override
-    public SitesImpl withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo) {
-        if (isInCreateMode()) {
-            this.inner().withSnapshotInfo(snapshotInfo);
-        } else {
-            this.updateParameter.withSnapshotInfo(snapshotInfo);
-        }
-        return this;
-    }
-
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SkuInfoImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SkuInfoImpl.java
index d1ce0e004341..9b513829681b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SkuInfoImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SkuInfoImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SkuDescription;
 
 class SkuInfoImpl extends WrapperImpl<SkuInfoInner> implements SkuInfo {
-    private final AppServiceManager manager;
-    SkuInfoImpl(SkuInfoInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SkuInfoImpl(SkuInfoInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceImpl.java
index 3de7321b127a..c9780717ed85 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceImpl.java
@@ -13,14 +13,14 @@
 import java.util.List;
 
 class SlotConfigNamesResourceImpl extends WrapperImpl<SlotConfigNamesResourceInner> implements SlotConfigNamesResource {
-    private final AppServiceManager manager;
-    SlotConfigNamesResourceImpl(SlotConfigNamesResourceInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SlotConfigNamesResourceImpl(SlotConfigNamesResourceInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -29,6 +29,11 @@ public List<String> appSettingNames() {
         return this.inner().appSettingNames();
     }
 
+    @Override
+    public List<String> azureStorageConfigNames() {
+        return this.inner().azureStorageConfigNames();
+    }
+
     @Override
     public List<String> connectionStringNames() {
         return this.inner().connectionStringNames();
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceInner.java
index 88c96aaf291e..543d8e0e344e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotConfigNamesResourceInner.java
@@ -30,6 +30,12 @@ public class SlotConfigNamesResourceInner extends ProxyOnlyResource {
     @JsonProperty(value = "properties.appSettingNames")
     private List<String> appSettingNames;
 
+    /**
+     * List of external Azure storage account identifiers.
+     */
+    @JsonProperty(value = "properties.azureStorageConfigNames")
+    private List<String> azureStorageConfigNames;
+
     /**
      * Get list of connection string names.
      *
@@ -70,4 +76,24 @@ public SlotConfigNamesResourceInner withAppSettingNames(List<String> appSettingN
         return this;
     }
 
+    /**
+     * Get list of external Azure storage account identifiers.
+     *
+     * @return the azureStorageConfigNames value
+     */
+    public List<String> azureStorageConfigNames() {
+        return this.azureStorageConfigNames;
+    }
+
+    /**
+     * Set list of external Azure storage account identifiers.
+     *
+     * @param azureStorageConfigNames the azureStorageConfigNames value to set
+     * @return the SlotConfigNamesResourceInner object itself.
+     */
+    public SlotConfigNamesResourceInner withAzureStorageConfigNames(List<String> azureStorageConfigNames) {
+        this.azureStorageConfigNames = azureStorageConfigNames;
+        return this;
+    }
+
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotDifferenceImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotDifferenceImpl.java
index ca25c3cb8249..62f136745a5e 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotDifferenceImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotDifferenceImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class SlotDifferenceImpl extends WrapperImpl<SlotDifferenceInner> implements SlotDifference {
-    private final AppServiceManager manager;
-    SlotDifferenceImpl(SlotDifferenceInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    SlotDifferenceImpl(SlotDifferenceInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotsImpl.java
index 131bda520fde..435a7d403700 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SlotsImpl.java
@@ -21,19 +21,18 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.HostingEnvironmentProfile;
 import com.microsoft.azure.management.appservice.v2018_02_01.CloningInfo;
-import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRecoveryRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotSwapStatus;
 import com.microsoft.azure.management.appservice.v2018_02_01.ManagedServiceIdentity;
 import rx.functions.Func1;
 
 class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> implements Slots, Slots.Definition, Slots.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String slot;
     private SitePatchResource updateParameter;
 
-    SlotsImpl(String name, AppServiceManager manager) {
+    SlotsImpl(String name, CertificateRegistrationManager manager) {
         super(name, new SiteInner());
         this.manager = manager;
         // Set resource name
@@ -42,7 +41,7 @@ class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> impl
         this.updateParameter = new SitePatchResource();
     }
 
-    SlotsImpl(SiteInner inner, AppServiceManager manager) {
+    SlotsImpl(SiteInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -56,7 +55,7 @@ class SlotsImpl extends CreatableUpdatableImpl<Slots, SiteInner, SlotsImpl> impl
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -173,6 +172,11 @@ public Boolean httpsOnly() {
         return this.inner().httpsOnly();
     }
 
+    @Override
+    public Boolean hyperV() {
+        return this.inner().hyperV();
+    }
+
     @Override
     public String id() {
         return this.inner().id();
@@ -263,11 +267,6 @@ public SlotSwapStatus slotSwapStatus() {
         return this.inner().slotSwapStatus();
     }
 
-    @Override
-    public SnapshotRecoveryRequest snapshotInfo() {
-        return this.inner().snapshotInfo();
-    }
-
     @Override
     public String state() {
         return this.inner().state();
@@ -428,6 +427,16 @@ public SlotsImpl withHttpsOnly(Boolean httpsOnly) {
         return this;
     }
 
+    @Override
+    public SlotsImpl withHyperV(Boolean hyperV) {
+        if (isInCreateMode()) {
+            this.inner().withHyperV(hyperV);
+        } else {
+            this.updateParameter.withHyperV(hyperV);
+        }
+        return this;
+    }
+
     @Override
     public SlotsImpl withIsXenon(Boolean isXenon) {
         if (isInCreateMode()) {
@@ -488,14 +497,4 @@ public SlotsImpl withSiteConfig(SiteConfig siteConfig) {
         return this;
     }
 
-    @Override
-    public SlotsImpl withSnapshotInfo(SnapshotRecoveryRequest snapshotInfo) {
-        if (isInCreateMode()) {
-            this.inner().withSnapshotInfo(snapshotInfo);
-        } else {
-            this.updateParameter.withSnapshotInfo(snapshotInfo);
-        }
-        return this;
-    }
-
 }
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SnapshotImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SnapshotImpl.java
index 1998f0b52e3f..27bd936c8419 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SnapshotImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SnapshotImpl.java
@@ -13,15 +13,15 @@
 import rx.Observable;
 
 class SnapshotImpl extends WrapperImpl<SnapshotInner> implements Snapshot {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    SnapshotImpl(SnapshotInner inner,  AppServiceManager manager) {
+    SnapshotImpl(SnapshotInner inner,  CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StampCapacityImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StampCapacityImpl.java
index 9d380cfb93f5..ddc6e3886f02 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StampCapacityImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StampCapacityImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.WorkerSizeOptions;
 
 class StampCapacityImpl extends WrapperImpl<StampCapacityInner> implements StampCapacity {
-    private final AppServiceManager manager;
-    StampCapacityImpl(StampCapacityInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    StampCapacityImpl(StampCapacityInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StorageMigrationResponseImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StorageMigrationResponseImpl.java
index 0a86a68374aa..9719fb392c90 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StorageMigrationResponseImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StorageMigrationResponseImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class StorageMigrationResponseImpl extends WrapperImpl<StorageMigrationResponseInner> implements StorageMigrationResponse {
-    private final AppServiceManager manager;
-    StorageMigrationResponseImpl(StorageMigrationResponseInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    StorageMigrationResponseImpl(StorageMigrationResponseInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StringDictionaryImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StringDictionaryImpl.java
index e691098a81df..da1376caed18 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StringDictionaryImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/StringDictionaryImpl.java
@@ -13,14 +13,14 @@
 import java.util.Map;
 
 class StringDictionaryImpl extends WrapperImpl<StringDictionaryInner> implements StringDictionary {
-    private final AppServiceManager manager;
-    StringDictionaryImpl(StringDictionaryInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    StringDictionaryImpl(StringDictionaryInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkImpl.java
new file mode 100644
index 000000000000..5887093fec08
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkImpl.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.microsoft.azure.management.appservice.v2018_02_01.SwiftVirtualNetwork;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+
+class SwiftVirtualNetworkImpl extends WrapperImpl<SwiftVirtualNetworkInner> implements SwiftVirtualNetwork {
+    private final CertificateRegistrationManager manager;
+    SwiftVirtualNetworkImpl(SwiftVirtualNetworkInner inner, CertificateRegistrationManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public CertificateRegistrationManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String subnetResourceId() {
+        return this.inner().subnetResourceId();
+    }
+
+    @Override
+    public Boolean swiftSupported() {
+        return this.inner().swiftSupported();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkInner.java
new file mode 100644
index 000000000000..4d57e0503064
--- /dev/null
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/SwiftVirtualNetworkInner.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2018_02_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.management.appservice.v2018_02_01.ProxyOnlyResource;
+
+/**
+ * Swift Virtual Network Contract. This is used to enable the new Swift way of
+ * doing virtual network integration.
+ */
+@JsonFlatten
+public class SwiftVirtualNetworkInner extends ProxyOnlyResource {
+    /**
+     * The Virtual Network subnet's resource ID. This is the subnet that this
+     * Web App will join. This subnet must have a delegation to
+     * Microsoft.Web/serverFarms defined first.
+     */
+    @JsonProperty(value = "properties.subnetResourceId")
+    private String subnetResourceId;
+
+    /**
+     * A flag that specifies if the scale unit this Web App is on supports
+     * Swift integration.
+     */
+    @JsonProperty(value = "properties.swiftSupported")
+    private Boolean swiftSupported;
+
+    /**
+     * Get the Virtual Network subnet's resource ID. This is the subnet that this Web App will join. This subnet must have a delegation to Microsoft.Web/serverFarms defined first.
+     *
+     * @return the subnetResourceId value
+     */
+    public String subnetResourceId() {
+        return this.subnetResourceId;
+    }
+
+    /**
+     * Set the Virtual Network subnet's resource ID. This is the subnet that this Web App will join. This subnet must have a delegation to Microsoft.Web/serverFarms defined first.
+     *
+     * @param subnetResourceId the subnetResourceId value to set
+     * @return the SwiftVirtualNetworkInner object itself.
+     */
+    public SwiftVirtualNetworkInner withSubnetResourceId(String subnetResourceId) {
+        this.subnetResourceId = subnetResourceId;
+        return this;
+    }
+
+    /**
+     * Get a flag that specifies if the scale unit this Web App is on supports Swift integration.
+     *
+     * @return the swiftSupported value
+     */
+    public Boolean swiftSupported() {
+        return this.swiftSupported;
+    }
+
+    /**
+     * Set a flag that specifies if the scale unit this Web App is on supports Swift integration.
+     *
+     * @param swiftSupported the swiftSupported value to set
+     * @return the SwiftVirtualNetworkInner object itself.
+     */
+    public SwiftVirtualNetworkInner withSwiftSupported(Boolean swiftSupported) {
+        this.swiftSupported = swiftSupported;
+        return this;
+    }
+
+}
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TldLegalAgreementImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TldLegalAgreementImpl.java
index ec89cc3b52a7..9e4b1958221b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TldLegalAgreementImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TldLegalAgreementImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class TldLegalAgreementImpl extends WrapperImpl<TldLegalAgreementInner> implements TldLegalAgreement {
-    private final AppServiceManager manager;
-    TldLegalAgreementImpl(TldLegalAgreementInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    TldLegalAgreementImpl(TldLegalAgreementInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainImpl.java
index 98210d5a4ad9..d8217e7542cb 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainImpl.java
@@ -15,16 +15,16 @@
 
 class TopLevelDomainImpl extends IndexableRefreshableWrapperImpl<TopLevelDomain, TopLevelDomainInner> implements TopLevelDomain {
     private String name;
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    TopLevelDomainImpl(TopLevelDomainInner inner,  AppServiceManager manager) {
+    TopLevelDomainImpl(TopLevelDomainInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.name = IdParsingUtils.getValueFromIdByName(inner.id(), "topLevelDomains");
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainsImpl.java
index eba88d479e8f..dc2883c85b0b 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TopLevelDomainsImpl.java
@@ -22,9 +22,9 @@
 
 class TopLevelDomainsImpl extends WrapperImpl<TopLevelDomainsInner> implements TopLevelDomains {
     private PagedListConverter<TopLevelDomainInner, TopLevelDomain> converter;
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    TopLevelDomainsImpl(AppServiceManager manager) {
+    TopLevelDomainsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().topLevelDomains());
         this.manager = manager;
         this.converter = new PagedListConverter<TopLevelDomainInner, TopLevelDomain>() {
@@ -35,7 +35,7 @@ public Observable<TopLevelDomain> typeConvertAsync(TopLevelDomainInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredJobHistoryImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredJobHistoryImpl.java
index df9b680cdd97..658cc27a38be 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredJobHistoryImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredJobHistoryImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.TriggeredJobRun;
 
 class TriggeredJobHistoryImpl extends WrapperImpl<TriggeredJobHistoryInner> implements TriggeredJobHistory {
-    private final AppServiceManager manager;
-    TriggeredJobHistoryImpl(TriggeredJobHistoryInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    TriggeredJobHistoryImpl(TriggeredJobHistoryInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredWebJobImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredWebJobImpl.java
index f9d76afe0f63..8b08235190e7 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredWebJobImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/TriggeredWebJobImpl.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.WebJobType;
 
 class TriggeredWebJobImpl extends IndexableRefreshableWrapperImpl<TriggeredWebJob, TriggeredWebJobInner> implements TriggeredWebJob {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
     private String slot;
 
-    TriggeredWebJobImpl(TriggeredWebJobInner inner,  AppServiceManager manager) {
+    TriggeredWebJobImpl(TriggeredWebJobInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -32,7 +32,7 @@ class TriggeredWebJobImpl extends IndexableRefreshableWrapperImpl<TriggeredWebJo
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UsageImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UsageImpl.java
index 8493fc14dd94..2d2ded348b18 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UsageImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UsageImpl.java
@@ -14,14 +14,14 @@
 import org.joda.time.DateTime;
 
 class UsageImpl extends WrapperImpl<UsageInner> implements Usage {
-    private final AppServiceManager manager;
-    UsageImpl(UsageInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    UsageImpl(UsageInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UserImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UserImpl.java
index 4022c0003bad..5676ae6c48b5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UserImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/UserImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class UserImpl extends WrapperImpl<UserInner> implements User {
-    private final AppServiceManager manager;
-    UserImpl(UserInner inner, AppServiceManager manager) {
+    private final CertificateRegistrationManager manager;
+    UserImpl(UserInner inner, CertificateRegistrationManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/VnetRouteImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/VnetRouteImpl.java
index b2c5ea1e267e..70769593ee03 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/VnetRouteImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/VnetRouteImpl.java
@@ -14,13 +14,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.RouteType;
 
 class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, VnetRouteImpl> implements VnetRoute, VnetRoute.Definition, VnetRoute.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String vnetName;
     private String routeName;
 
-    VnetRouteImpl(String name, AppServiceManager manager) {
+    VnetRouteImpl(String name, CertificateRegistrationManager manager) {
         super(name, new VnetRouteInner());
         this.manager = manager;
         // Set resource name
@@ -28,7 +28,7 @@ class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, Vn
         //
     }
 
-    VnetRouteImpl(VnetRouteInner inner, AppServiceManager manager) {
+    VnetRouteImpl(VnetRouteInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class VnetRouteImpl extends CreatableUpdatableImpl<VnetRoute, VnetRouteInner, Vn
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsImpl.java
index c89cd68e4218..8fb7a65bacdc 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsImpl.java
@@ -16,25 +16,30 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.Sites;
 import com.microsoft.azure.Page;
 import rx.Completable;
+import java.util.List;
 import com.microsoft.azure.management.appservice.v2018_02_01.CustomHostnameAnalysisResult;
 import com.microsoft.azure.management.appservice.v2018_02_01.BackupItem;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteConfigResource;
 import com.microsoft.azure.management.appservice.v2018_02_01.BackupRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.StringDictionary;
+import com.microsoft.azure.management.appservice.v2018_02_01.SwiftVirtualNetwork;
+import com.microsoft.azure.management.appservice.v2018_02_01.RestoreRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.RelayServiceConnectionEntity;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteCloneability;
 import com.microsoft.azure.management.appservice.v2018_02_01.FunctionSecrets;
 import com.microsoft.azure.management.appservice.v2018_02_01.StorageMigrationResponse;
 import com.microsoft.azure.management.appservice.v2018_02_01.Operation;
+import com.microsoft.azure.management.appservice.v2018_02_01.NetworkTrace;
 import com.microsoft.azure.management.appservice.v2018_02_01.SitePhpErrorLogFlag;
 import com.microsoft.azure.management.appservice.v2018_02_01.SlotDifference;
 import com.microsoft.azure.management.appservice.v2018_02_01.CsmSlotEntity;
 import com.microsoft.azure.management.appservice.v2018_02_01.StorageMigrationOptions;
 import com.microsoft.azure.management.appservice.v2018_02_01.MigrateMySqlRequest;
+import com.microsoft.azure.management.appservice.v2018_02_01.CsmPublishingProfileOptions;
 import com.microsoft.azure.management.appservice.v2018_02_01.DeletedAppRestoreRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRestoreRequest;
-import com.microsoft.azure.management.appservice.v2018_02_01.RestoreRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteAuthSettings;
+import com.microsoft.azure.management.appservice.v2018_02_01.AzureStoragePropertyDictionaryResource;
 import com.microsoft.azure.management.appservice.v2018_02_01.ConnectionStringDictionary;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteLogsConfig;
 import com.microsoft.azure.management.appservice.v2018_02_01.User;
@@ -62,6 +67,7 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.NetworkFeatures;
 import com.microsoft.azure.management.appservice.v2018_02_01.PerfMonResponse;
 import com.microsoft.azure.management.appservice.v2018_02_01.PremierAddOn;
+import com.microsoft.azure.management.appservice.v2018_02_01.PremierAddOnPatchResource;
 import com.microsoft.azure.management.appservice.v2018_02_01.PrivateAccess;
 import com.microsoft.azure.management.appservice.v2018_02_01.PublicCertificate;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteExtensionInfo;
@@ -71,19 +77,18 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.TriggeredJobHistory;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteCsmUsageQuota;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteVnetInfo;
-import java.util.List;
 import com.microsoft.azure.management.appservice.v2018_02_01.SiteVnetGateway;
 import com.microsoft.azure.management.appservice.v2018_02_01.WebJob;
 
 class WebAppsImpl extends WrapperImpl<WebAppsInner> implements WebApps {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
 
-    WebAppsImpl(AppServiceManager manager) {
+    WebAppsImpl(CertificateRegistrationManager manager) {
         super(manager.inner().webApps());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
@@ -620,6 +625,48 @@ public StringDictionary call(StringDictionaryInner inner) {
         });
     }
 
+    @Override
+    public Observable<SwiftVirtualNetwork> getSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name) {
+        WebAppsInner client = this.inner();
+        return client.getSwiftVirtualNetworkConnectionAsync(resourceGroupName, name)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<SwiftVirtualNetwork> createOrUpdateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        WebAppsInner client = this.inner();
+        return client.createOrUpdateSwiftVirtualNetworkConnectionAsync(resourceGroupName, name, connectionEnvelope)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteSwiftVirtualNetworkAsync(String resourceGroupName, String name) {
+        WebAppsInner client = this.inner();
+        return client.deleteSwiftVirtualNetworkAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<SwiftVirtualNetwork> updateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        WebAppsInner client = this.inner();
+        return client.updateSwiftVirtualNetworkConnectionAsync(resourceGroupName, name, connectionEnvelope)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<SiteConfigResource> getConfigurationAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
@@ -662,6 +709,18 @@ public Completable getWebSiteContainerLogsAsync(String resourceGroupName, String
         return client.getWebSiteContainerLogsAsync(resourceGroupName, name).toCompletable();
     }
 
+    @Override
+    public Observable<RestoreRequest> discoverBackupAsync(String resourceGroupName, String name, RestoreRequestInner request) {
+        WebAppsInner client = this.inner();
+        return client.discoverBackupAsync(resourceGroupName, name, request)
+        .map(new Func1<RestoreRequestInner, RestoreRequest>() {
+            @Override
+            public RestoreRequest call(RestoreRequestInner inner) {
+                return new RestoreRequestImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Completable getFunctionsAdminTokenAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
@@ -770,18 +829,48 @@ public Operation call(OperationInner inner) {
         });
     }
 
+    @Override
+    public Completable getNetworkTraceOperationAsync(String resourceGroupName, String name, String operationId) {
+        WebAppsInner client = this.inner();
+        return client.getNetworkTraceOperationAsync(resourceGroupName, name, operationId).toCompletable();
+    }
+
     @Override
     public Completable startWebSiteNetworkTraceAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
         return client.startWebSiteNetworkTraceAsync(resourceGroupName, name).toCompletable();
     }
 
+    @Override
+    public Completable startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name) {
+        WebAppsInner client = this.inner();
+        return client.startWebSiteNetworkTraceOperationAsync(resourceGroupName, name).toCompletable();
+    }
+
     @Override
     public Completable stopWebSiteNetworkTraceAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
         return client.stopWebSiteNetworkTraceAsync(resourceGroupName, name).toCompletable();
     }
 
+    @Override
+    public Observable<NetworkTrace> getNetworkTracesAsync(String resourceGroupName, String name, String operationId) {
+        WebAppsInner client = this.inner();
+        return client.getNetworkTracesAsync(resourceGroupName, name, operationId)
+        .flatMap(new Func1<List<NetworkTraceInner>, Observable<NetworkTraceInner>>() {
+            @Override
+            public Observable<NetworkTraceInner> call(List<NetworkTraceInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<NetworkTraceInner, NetworkTrace>() {
+            @Override
+            public NetworkTrace call(NetworkTraceInner inner) {
+                return new NetworkTraceImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Completable generateNewSitePublishingPasswordAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
@@ -807,9 +896,9 @@ public Completable getProcessDumpAsync(String resourceGroupName, String name, St
     }
 
     @Override
-    public Completable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name) {
+    public Completable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions) {
         WebAppsInner client = this.inner();
-        return client.listPublishingProfileXmlWithSecretsAsync(resourceGroupName, name).toCompletable();
+        return client.listPublishingProfileXmlWithSecretsAsync(resourceGroupName, name, publishingProfileOptions).toCompletable();
     }
 
     @Override
@@ -926,18 +1015,6 @@ public Completable deleteBackupAsync(String resourceGroupName, String name, Stri
         return client.deleteBackupAsync(resourceGroupName, name, backupId).toCompletable();
     }
 
-    @Override
-    public Observable<RestoreRequest> discoverRestoreAsync(String resourceGroupName, String name, RestoreRequestInner request) {
-        WebAppsInner client = this.inner();
-        return client.discoverRestoreAsync(resourceGroupName, name, request)
-        .map(new Func1<RestoreRequestInner, RestoreRequest>() {
-            @Override
-            public RestoreRequest call(RestoreRequestInner inner) {
-                return new RestoreRequestImpl(inner, manager());
-            }
-        });
-    }
-
     @Override
     public Observable<BackupItem> listBackupStatusSecretsAsync(String resourceGroupName, String name, String backupId, BackupRequestInner request) {
         WebAppsInner client = this.inner();
@@ -974,18 +1051,6 @@ public BackupItem call(BackupItemInner inner) {
         });
     }
 
-    @Override
-    public Observable<RestoreRequest> discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
-        WebAppsInner client = this.inner();
-        return client.discoverRestoreSlotAsync(resourceGroupName, name, slot, request)
-        .map(new Func1<RestoreRequestInner, RestoreRequest>() {
-            @Override
-            public RestoreRequest call(RestoreRequestInner inner) {
-                return new RestoreRequestImpl(inner, manager());
-            }
-        });
-    }
-
     @Override
     public Observable<BackupItem> getBackupStatusSlotAsync(String resourceGroupName, String name, String backupId, String slot) {
         WebAppsInner client = this.inner();
@@ -1118,6 +1183,54 @@ public SiteAuthSettings call(SiteAuthSettingsInner inner) {
         });
     }
 
+    @Override
+    public Observable<AzureStoragePropertyDictionaryResource> updateAzureStorageAccountsAsync(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        WebAppsInner client = this.inner();
+        return client.updateAzureStorageAccountsAsync(resourceGroupName, name, azureStorageAccounts)
+        .map(new Func1<AzureStoragePropertyDictionaryResourceInner, AzureStoragePropertyDictionaryResource>() {
+            @Override
+            public AzureStoragePropertyDictionaryResource call(AzureStoragePropertyDictionaryResourceInner inner) {
+                return new AzureStoragePropertyDictionaryResourceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AzureStoragePropertyDictionaryResource> listAzureStorageAccountsAsync(String resourceGroupName, String name) {
+        WebAppsInner client = this.inner();
+        return client.listAzureStorageAccountsAsync(resourceGroupName, name)
+        .map(new Func1<AzureStoragePropertyDictionaryResourceInner, AzureStoragePropertyDictionaryResource>() {
+            @Override
+            public AzureStoragePropertyDictionaryResource call(AzureStoragePropertyDictionaryResourceInner inner) {
+                return new AzureStoragePropertyDictionaryResourceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AzureStoragePropertyDictionaryResource> updateAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        WebAppsInner client = this.inner();
+        return client.updateAzureStorageAccountsSlotAsync(resourceGroupName, name, slot, azureStorageAccounts)
+        .map(new Func1<AzureStoragePropertyDictionaryResourceInner, AzureStoragePropertyDictionaryResource>() {
+            @Override
+            public AzureStoragePropertyDictionaryResource call(AzureStoragePropertyDictionaryResourceInner inner) {
+                return new AzureStoragePropertyDictionaryResourceImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<AzureStoragePropertyDictionaryResource> listAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot) {
+        WebAppsInner client = this.inner();
+        return client.listAzureStorageAccountsSlotAsync(resourceGroupName, name, slot)
+        .map(new Func1<AzureStoragePropertyDictionaryResourceInner, AzureStoragePropertyDictionaryResource>() {
+            @Override
+            public AzureStoragePropertyDictionaryResource call(AzureStoragePropertyDictionaryResourceInner inner) {
+                return new AzureStoragePropertyDictionaryResourceImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<ConnectionStringDictionary> updateConnectionStringsAsync(String resourceGroupName, String name, ConnectionStringDictionaryInner connectionStrings) {
         WebAppsInner client = this.inner();
@@ -2834,6 +2947,18 @@ public Completable deletePremierAddOnSlotAsync(String resourceGroupName, String
         return client.deletePremierAddOnSlotAsync(resourceGroupName, name, premierAddOnName, slot).toCompletable();
     }
 
+    @Override
+    public Observable<PremierAddOn> updatePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn) {
+        WebAppsInner client = this.inner();
+        return client.updatePremierAddOnSlotAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn)
+        .map(new Func1<PremierAddOnInner, PremierAddOn>() {
+            @Override
+            public PremierAddOn call(PremierAddOnInner inner) {
+                return new PremierAddOnImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<PrivateAccess> getPrivateAccessAsync(String resourceGroupName, String name) {
         WebAppsInner client = this.inner();
@@ -3188,6 +3313,48 @@ public StringDictionary call(StringDictionaryInner inner) {
         });
     }
 
+    @Override
+    public Observable<SwiftVirtualNetwork> getSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot) {
+        WebAppsInner client = this.inner();
+        return client.getSwiftVirtualNetworkConnectionSlotAsync(resourceGroupName, name, slot)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<SwiftVirtualNetwork> createOrUpdateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        WebAppsInner client = this.inner();
+        return client.createOrUpdateSwiftVirtualNetworkConnectionSlotAsync(resourceGroupName, name, slot, connectionEnvelope)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteSwiftVirtualNetworkSlotAsync(String resourceGroupName, String name, String slot) {
+        WebAppsInner client = this.inner();
+        return client.deleteSwiftVirtualNetworkSlotAsync(resourceGroupName, name, slot).toCompletable();
+    }
+
+    @Override
+    public Observable<SwiftVirtualNetwork> updateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        WebAppsInner client = this.inner();
+        return client.updateSwiftVirtualNetworkConnectionSlotAsync(resourceGroupName, name, slot, connectionEnvelope)
+        .map(new Func1<SwiftVirtualNetworkInner, SwiftVirtualNetwork>() {
+            @Override
+            public SwiftVirtualNetwork call(SwiftVirtualNetworkInner inner) {
+                return new SwiftVirtualNetworkImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Observable<SiteConfigResource> getConfigurationSlotAsync(String resourceGroupName, String name, String slot) {
         WebAppsInner client = this.inner();
@@ -3230,6 +3397,18 @@ public Completable getWebSiteContainerLogsSlotAsync(String resourceGroupName, St
         return client.getWebSiteContainerLogsSlotAsync(resourceGroupName, name, slot).toCompletable();
     }
 
+    @Override
+    public Observable<RestoreRequest> discoverBackupSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
+        WebAppsInner client = this.inner();
+        return client.discoverBackupSlotAsync(resourceGroupName, name, slot, request)
+        .map(new Func1<RestoreRequestInner, RestoreRequest>() {
+            @Override
+            public RestoreRequest call(RestoreRequestInner inner) {
+                return new RestoreRequestImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Completable getFunctionsAdminTokenSlotAsync(String resourceGroupName, String name, String slot) {
         WebAppsInner client = this.inner();
@@ -3314,18 +3493,48 @@ public FunctionSecrets call(FunctionSecretsInner inner) {
         });
     }
 
+    @Override
+    public Completable getNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot) {
+        WebAppsInner client = this.inner();
+        return client.getNetworkTraceOperationSlotAsync(resourceGroupName, name, operationId, slot).toCompletable();
+    }
+
     @Override
     public Completable startWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot) {
         WebAppsInner client = this.inner();
         return client.startWebSiteNetworkTraceSlotAsync(resourceGroupName, name, slot).toCompletable();
     }
 
+    @Override
+    public Completable startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot) {
+        WebAppsInner client = this.inner();
+        return client.startWebSiteNetworkTraceOperationSlotAsync(resourceGroupName, name, slot).toCompletable();
+    }
+
     @Override
     public Completable stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot) {
         WebAppsInner client = this.inner();
         return client.stopWebSiteNetworkTraceSlotAsync(resourceGroupName, name, slot).toCompletable();
     }
 
+    @Override
+    public Observable<NetworkTrace> getNetworkTracesSlotAsync(String resourceGroupName, String name, String operationId, String slot) {
+        WebAppsInner client = this.inner();
+        return client.getNetworkTracesSlotAsync(resourceGroupName, name, operationId, slot)
+        .flatMap(new Func1<List<NetworkTraceInner>, Observable<NetworkTraceInner>>() {
+            @Override
+            public Observable<NetworkTraceInner> call(List<NetworkTraceInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<NetworkTraceInner, NetworkTrace>() {
+            @Override
+            public NetworkTrace call(NetworkTraceInner inner) {
+                return new NetworkTraceImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     public Completable generateNewSitePublishingPasswordSlotAsync(String resourceGroupName, String name, String slot) {
         WebAppsInner client = this.inner();
@@ -3351,9 +3560,9 @@ public Completable getProcessDumpSlotAsync(String resourceGroupName, String name
     }
 
     @Override
-    public Completable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot) {
+    public Completable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions) {
         WebAppsInner client = this.inner();
-        return client.listPublishingProfileXmlWithSecretsSlotAsync(resourceGroupName, name, slot).toCompletable();
+        return client.listPublishingProfileXmlWithSecretsSlotAsync(resourceGroupName, name, slot, publishingProfileOptions).toCompletable();
     }
 
     @Override
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsInner.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsInner.java
index a81903070ed5..767030d8b63f 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsInner.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebAppsInner.java
@@ -22,7 +22,7 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.DeletedAppRestoreRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.MigrateMySqlRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.MSDeploy;
-import com.microsoft.azure.management.appservice.v2018_02_01.PublishingProfileFormat;
+import com.microsoft.azure.management.appservice.v2018_02_01.PremierAddOnPatchResource;
 import com.microsoft.azure.management.appservice.v2018_02_01.SitePatchResource;
 import com.microsoft.azure.management.appservice.v2018_02_01.SnapshotRestoreRequest;
 import com.microsoft.azure.management.appservice.v2018_02_01.StorageMigrationOptions;
@@ -122,10 +122,6 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups")
         Observable<Response<ResponseBody>> listBackups(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps discoverRestore" })
-        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/discover")
-        Observable<Response<ResponseBody>> discoverRestore(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body RestoreRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
-
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getBackupStatus" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/{backupId}")
         Observable<Response<ResponseBody>> getBackupStatus(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("backupId") String backupId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -166,6 +162,14 @@ interface WebAppsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list")
         Observable<Response<ResponseBody>> getAuthSettings(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateAzureStorageAccounts" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts")
+        Observable<Response<ResponseBody>> updateAzureStorageAccounts(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body AzureStoragePropertyDictionaryResourceInner azureStorageAccounts, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listAzureStorageAccounts" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/azurestorageaccounts/list")
+        Observable<Response<ResponseBody>> listAzureStorageAccounts(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateBackupConfiguration" })
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup")
         Observable<Response<ResponseBody>> updateBackupConfiguration(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body BackupRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -226,6 +230,22 @@ interface WebAppsService {
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames")
         Observable<Response<ResponseBody>> updateSlotConfigurationNames(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SlotConfigNamesResourceInner slotConfigNames, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getSwiftVirtualNetworkConnection" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> getSwiftVirtualNetworkConnection(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps createOrUpdateSwiftVirtualNetworkConnection" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> createOrUpdateSwiftVirtualNetworkConnection(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SwiftVirtualNetworkInner connectionEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps deleteSwiftVirtualNetwork" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteSwiftVirtualNetwork(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateSwiftVirtualNetworkConnection" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> updateSwiftVirtualNetworkConnection(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SwiftVirtualNetworkInner connectionEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getConfiguration" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web")
         Observable<Response<ResponseBody>> getConfiguration(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -300,6 +320,10 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/deployments/{id}/log")
         Observable<Response<ResponseBody>> listDeploymentLog(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("id") String id, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps discoverBackup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/discoverbackup")
+        Observable<Response<ResponseBody>> discoverBackup(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body RestoreRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listDomainOwnershipIdentifiers" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers")
         Observable<Response<ResponseBody>> listDomainOwnershipIdentifiers(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -517,14 +541,30 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkFeatures/{view}")
         Observable<Response<ResponseBody>> listNetworkFeatures(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("view") String view, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getNetworkTraceOperation" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/operationresults/{operationId}")
+        Observable<Response<ResponseBody>> getNetworkTraceOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps startWebSiteNetworkTrace" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/start")
         Observable<Response<ResponseBody>> startWebSiteNetworkTrace(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps startWebSiteNetworkTraceOperation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/startOperation")
+        Observable<Response<ResponseBody>> startWebSiteNetworkTraceOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps beginStartWebSiteNetworkTraceOperation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/startOperation")
+        Observable<Response<ResponseBody>> beginStartWebSiteNetworkTraceOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps stopWebSiteNetworkTrace" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/stop")
         Observable<Response<ResponseBody>> stopWebSiteNetworkTrace(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getNetworkTraces" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/{operationId}")
+        Observable<Response<ResponseBody>> getNetworkTraces(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps generateNewSitePublishingPassword" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/newpassword")
         Observable<Response<ResponseBody>> generateNewSitePublishingPassword(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -553,6 +593,10 @@ interface WebAppsService {
         @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}", method = "DELETE", hasBody = true)
         Observable<Response<ResponseBody>> deletePremierAddOn(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updatePremierAddOn" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}")
+        Observable<Response<ResponseBody>> updatePremierAddOn(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnPatchResource premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getPrivateAccess" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/privateAccess/virtualNetworks")
         Observable<Response<ResponseBody>> getPrivateAccess(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -613,7 +657,7 @@ interface WebAppsService {
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listPublishingProfileXmlWithSecrets" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/publishxml")
         @Streaming
-        Observable<Response<ResponseBody>> listPublishingProfileXmlWithSecrets(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CsmPublishingProfileOptions publishingProfileOptions, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listPublishingProfileXmlWithSecrets(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body CsmPublishingProfileOptions publishingProfileOptions, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps resetProductionSlotConfig" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resetSlotConfig")
@@ -707,10 +751,6 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups")
         Observable<Response<ResponseBody>> listBackupsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps discoverRestoreSlot" })
-        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/discover")
-        Observable<Response<ResponseBody>> discoverRestoreSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body RestoreRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
-
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getBackupStatusSlot" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/{backupId}")
         Observable<Response<ResponseBody>> getBackupStatusSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("backupId") String backupId, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -751,6 +791,14 @@ interface WebAppsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list")
         Observable<Response<ResponseBody>> getAuthSettingsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateAzureStorageAccountsSlot" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts")
+        Observable<Response<ResponseBody>> updateAzureStorageAccountsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body AzureStoragePropertyDictionaryResourceInner azureStorageAccounts, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listAzureStorageAccountsSlot" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/azurestorageaccounts/list")
+        Observable<Response<ResponseBody>> listAzureStorageAccountsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateBackupConfigurationSlot" })
         @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/backup")
         Observable<Response<ResponseBody>> updateBackupConfigurationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body BackupRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -803,6 +851,22 @@ interface WebAppsService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/pushsettings/list")
         Observable<Response<ResponseBody>> listSitePushSettingsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getSwiftVirtualNetworkConnectionSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> getSwiftVirtualNetworkConnectionSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps createOrUpdateSwiftVirtualNetworkConnectionSlot" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> createOrUpdateSwiftVirtualNetworkConnectionSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body SwiftVirtualNetworkInner connectionEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps deleteSwiftVirtualNetworkSlot" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteSwiftVirtualNetworkSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updateSwiftVirtualNetworkConnectionSlot" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/virtualNetwork")
+        Observable<Response<ResponseBody>> updateSwiftVirtualNetworkConnectionSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body SwiftVirtualNetworkInner connectionEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getConfigurationSlot" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web")
         Observable<Response<ResponseBody>> getConfigurationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -877,6 +941,10 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/deployments/{id}/log")
         Observable<Response<ResponseBody>> listDeploymentLogSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("id") String id, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps discoverBackupSlot" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/discoverbackup")
+        Observable<Response<ResponseBody>> discoverBackupSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body RestoreRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listDomainOwnershipIdentifiersSlot" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers")
         Observable<Response<ResponseBody>> listDomainOwnershipIdentifiersSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -1078,14 +1146,30 @@ interface WebAppsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkFeatures/{view}")
         Observable<Response<ResponseBody>> listNetworkFeaturesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("view") String view, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getNetworkTraceOperationSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/operationresults/{operationId}")
+        Observable<Response<ResponseBody>> getNetworkTraceOperationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps startWebSiteNetworkTraceSlot" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/start")
         Observable<Response<ResponseBody>> startWebSiteNetworkTraceSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps startWebSiteNetworkTraceOperationSlot" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/startOperation")
+        Observable<Response<ResponseBody>> startWebSiteNetworkTraceOperationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps beginStartWebSiteNetworkTraceOperationSlot" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/startOperation")
+        Observable<Response<ResponseBody>> beginStartWebSiteNetworkTraceOperationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("durationInSeconds") Integer durationInSeconds, @Query("maxFrameLength") Integer maxFrameLength, @Query("sasUrl") String sasUrl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps stopWebSiteNetworkTraceSlot" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/stop")
         Observable<Response<ResponseBody>> stopWebSiteNetworkTraceSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getNetworkTracesSlot" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkTrace/{operationId}")
+        Observable<Response<ResponseBody>> getNetworkTracesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps generateNewSitePublishingPasswordSlot" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/newpassword")
         Observable<Response<ResponseBody>> generateNewSitePublishingPasswordSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -1114,6 +1198,10 @@ interface WebAppsService {
         @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}", method = "DELETE", hasBody = true)
         Observable<Response<ResponseBody>> deletePremierAddOnSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps updatePremierAddOnSlot" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}")
+        Observable<Response<ResponseBody>> updatePremierAddOnSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnPatchResource premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps getPrivateAccessSlot" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/privateAccess/virtualNetworks")
         Observable<Response<ResponseBody>> getPrivateAccessSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -1174,7 +1262,7 @@ interface WebAppsService {
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps listPublishingProfileXmlWithSecretsSlot" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/publishxml")
         @Streaming
-        Observable<Response<ResponseBody>> listPublishingProfileXmlWithSecretsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CsmPublishingProfileOptions publishingProfileOptions, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listPublishingProfileXmlWithSecretsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body CsmPublishingProfileOptions publishingProfileOptions, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebApps resetSlotConfigurationSlot" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resetSlotConfig")
@@ -3095,104 +3183,6 @@ private ServiceResponse<PageImpl<BackupItemInner>> listBackupsDelegate(Response<
                 .build(response);
     }
 
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the RestoreRequestInner object if successful.
-     */
-    public RestoreRequestInner discoverRestore(String resourceGroupName, String name, RestoreRequestInner request) {
-        return discoverRestoreWithServiceResponseAsync(resourceGroupName, name, request).toBlocking().single().body();
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @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<RestoreRequestInner> discoverRestoreAsync(String resourceGroupName, String name, RestoreRequestInner request, final ServiceCallback<RestoreRequestInner> serviceCallback) {
-        return ServiceFuture.fromResponse(discoverRestoreWithServiceResponseAsync(resourceGroupName, name, request), serviceCallback);
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RestoreRequestInner object
-     */
-    public Observable<RestoreRequestInner> discoverRestoreAsync(String resourceGroupName, String name, RestoreRequestInner request) {
-        return discoverRestoreWithServiceResponseAsync(resourceGroupName, name, request).map(new Func1<ServiceResponse<RestoreRequestInner>, RestoreRequestInner>() {
-            @Override
-            public RestoreRequestInner call(ServiceResponse<RestoreRequestInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RestoreRequestInner object
-     */
-    public Observable<ServiceResponse<RestoreRequestInner>> discoverRestoreWithServiceResponseAsync(String resourceGroupName, String name, RestoreRequestInner request) {
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        if (request == null) {
-            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
-        }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        Validator.validate(request);
-        return service.discoverRestore(resourceGroupName, name, this.client.subscriptionId(), request, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RestoreRequestInner>>>() {
-                @Override
-                public Observable<ServiceResponse<RestoreRequestInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<RestoreRequestInner> clientResponse = discoverRestoreDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
-    private ServiceResponse<RestoreRequestInner> discoverRestoreDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<RestoreRequestInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<RestoreRequestInner>() { }.getType())
-                .registerError(DefaultErrorResponseException.class)
-                .build(response);
-    }
-
     /**
      * Gets a backup of an app by its ID.
      * Gets a backup of an app by its ID.
@@ -4188,6 +4178,194 @@ private ServiceResponse<SiteAuthSettingsInner> getAuthSettingsDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the AzureStoragePropertyDictionaryResourceInner object if successful.
+     */
+    public AzureStoragePropertyDictionaryResourceInner updateAzureStorageAccounts(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        return updateAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name, azureStorageAccounts).toBlocking().single().body();
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @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<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsAsync(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts, final ServiceCallback<AzureStoragePropertyDictionaryResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name, azureStorageAccounts), serviceCallback);
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsAsync(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        return updateAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name, azureStorageAccounts).map(new Func1<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>, AzureStoragePropertyDictionaryResourceInner>() {
+            @Override
+            public AzureStoragePropertyDictionaryResourceInner call(ServiceResponse<AzureStoragePropertyDictionaryResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> updateAzureStorageAccountsWithServiceResponseAsync(String resourceGroupName, String name, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (azureStorageAccounts == null) {
+            throw new IllegalArgumentException("Parameter azureStorageAccounts is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(azureStorageAccounts);
+        return service.updateAzureStorageAccounts(resourceGroupName, name, this.client.subscriptionId(), azureStorageAccounts, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureStoragePropertyDictionaryResourceInner> clientResponse = updateAzureStorageAccountsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureStoragePropertyDictionaryResourceInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureStoragePropertyDictionaryResourceInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the AzureStoragePropertyDictionaryResourceInner object if successful.
+     */
+    public AzureStoragePropertyDictionaryResourceInner listAzureStorageAccounts(String resourceGroupName, String name) {
+        return listAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @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<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsAsync(String resourceGroupName, String name, final ServiceCallback<AzureStoragePropertyDictionaryResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsAsync(String resourceGroupName, String name) {
+        return listAzureStorageAccountsWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>, AzureStoragePropertyDictionaryResourceInner>() {
+            @Override
+            public AzureStoragePropertyDictionaryResourceInner call(ServiceResponse<AzureStoragePropertyDictionaryResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> listAzureStorageAccountsWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listAzureStorageAccounts(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureStoragePropertyDictionaryResourceInner> clientResponse = listAzureStorageAccountsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureStoragePropertyDictionaryResourceInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureStoragePropertyDictionaryResourceInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Updates the backup configuration of an app.
      * Updates the backup configuration of an app.
@@ -5568,6 +5746,398 @@ private ServiceResponse<SlotConfigNamesResourceInner> updateSlotConfigurationNam
                 .build(response);
     }
 
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner getSwiftVirtualNetworkConnection(String resourceGroupName, String name) {
+        return getSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @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<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name) {
+        return getSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> getSwiftVirtualNetworkConnectionWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSwiftVirtualNetworkConnection(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = getSwiftVirtualNetworkConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner createOrUpdateSwiftVirtualNetworkConnection(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        return createOrUpdateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope).toBlocking().single().body();
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @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<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope), serviceCallback);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        return createOrUpdateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> createOrUpdateSwiftVirtualNetworkConnectionWithServiceResponseAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (connectionEnvelope == null) {
+            throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(connectionEnvelope);
+        return service.createOrUpdateSwiftVirtualNetworkConnection(resourceGroupName, name, this.client.subscriptionId(), connectionEnvelope, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = createOrUpdateSwiftVirtualNetworkConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @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
+     */
+    public void deleteSwiftVirtualNetwork(String resourceGroupName, String name) {
+        deleteSwiftVirtualNetworkWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @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<Void> deleteSwiftVirtualNetworkAsync(String resourceGroupName, String name, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteSwiftVirtualNetworkWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteSwiftVirtualNetworkAsync(String resourceGroupName, String name) {
+        return deleteSwiftVirtualNetworkWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteSwiftVirtualNetworkWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.deleteSwiftVirtualNetwork(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteSwiftVirtualNetworkDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteSwiftVirtualNetworkDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(404, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner updateSwiftVirtualNetworkConnection(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        return updateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope).toBlocking().single().body();
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @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<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope), serviceCallback);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        return updateSwiftVirtualNetworkConnectionWithServiceResponseAsync(resourceGroupName, name, connectionEnvelope).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> updateSwiftVirtualNetworkConnectionWithServiceResponseAsync(String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (connectionEnvelope == null) {
+            throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(connectionEnvelope);
+        return service.updateSwiftVirtualNetworkConnection(resourceGroupName, name, this.client.subscriptionId(), connectionEnvelope, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = updateSwiftVirtualNetworkConnectionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
@@ -7398,6 +7968,104 @@ private ServiceResponse<DeploymentInner> listDeploymentLogDelegate(Response<Resp
                 .build(response);
     }
 
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RestoreRequestInner object if successful.
+     */
+    public RestoreRequestInner discoverBackup(String resourceGroupName, String name, RestoreRequestInner request) {
+        return discoverBackupWithServiceResponseAsync(resourceGroupName, name, request).toBlocking().single().body();
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @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<RestoreRequestInner> discoverBackupAsync(String resourceGroupName, String name, RestoreRequestInner request, final ServiceCallback<RestoreRequestInner> serviceCallback) {
+        return ServiceFuture.fromResponse(discoverBackupWithServiceResponseAsync(resourceGroupName, name, request), serviceCallback);
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestoreRequestInner object
+     */
+    public Observable<RestoreRequestInner> discoverBackupAsync(String resourceGroupName, String name, RestoreRequestInner request) {
+        return discoverBackupWithServiceResponseAsync(resourceGroupName, name, request).map(new Func1<ServiceResponse<RestoreRequestInner>, RestoreRequestInner>() {
+            @Override
+            public RestoreRequestInner call(ServiceResponse<RestoreRequestInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestoreRequestInner object
+     */
+    public Observable<ServiceResponse<RestoreRequestInner>> discoverBackupWithServiceResponseAsync(String resourceGroupName, String name, RestoreRequestInner request) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(request);
+        return service.discoverBackup(resourceGroupName, name, this.client.subscriptionId(), request, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RestoreRequestInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RestoreRequestInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RestoreRequestInner> clientResponse = discoverBackupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RestoreRequestInner> discoverBackupDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RestoreRequestInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RestoreRequestInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Lists ownership identifiers for domain associated with web app.
      * Lists ownership identifiers for domain associated with web app.
@@ -12462,7 +13130,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -12485,7 +13153,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -12509,7 +13177,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -12530,7 +13198,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -12555,7 +13223,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param name Name of the app.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify "true" to include metric details in the response. It is "false" by default.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -13154,8 +13822,106 @@ private ServiceResponse<NetworkFeaturesInner> listNetworkFeaturesDelegate(Respon
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object getNetworkTraceOperation(String resourceGroupName, String name, String operationId) {
+        return getNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, operationId).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @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<Object> getNetworkTraceOperationAsync(String resourceGroupName, String name, String operationId, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, operationId), serviceCallback);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> getNetworkTraceOperationAsync(String resourceGroupName, String name, String operationId) {
+        return getNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, operationId).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> getNetworkTraceOperationWithServiceResponseAsync(String resourceGroupName, String name, String operationId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (operationId == null) {
+            throw new IllegalArgumentException("Parameter operationId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getNetworkTraceOperation(resourceGroupName, name, operationId, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = getNetworkTraceOperationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Object> getNetworkTraceOperationDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Object, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
+                .register(202, new TypeToken<OperationInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13169,8 +13935,8 @@ public String startWebSiteNetworkTrace(String resourceGroupName, String name) {
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13183,8 +13949,8 @@ public ServiceFuture<String> startWebSiteNetworkTraceAsync(String resourceGroupN
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13201,8 +13967,8 @@ public String call(ServiceResponse<String> response) {
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13240,8 +14006,8 @@ public Observable<ServiceResponse<String>> call(Response<ResponseBody> response)
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13258,8 +14024,8 @@ public String startWebSiteNetworkTrace(String resourceGroupName, String name, In
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13275,8 +14041,8 @@ public ServiceFuture<String> startWebSiteNetworkTraceAsync(String resourceGroupN
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13296,8 +14062,8 @@ public String call(ServiceResponse<String> response) {
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -13341,6 +14107,355 @@ private ServiceResponse<String> startWebSiteNetworkTraceDelegate(Response<Respon
                 .build(response);
     }
 
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object startWebSiteNetworkTraceOperation(String resourceGroupName, String name) {
+        return startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name).toBlocking().last().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @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<Object> startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Object> startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name) {
+        return startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Object>> startWebSiteNetworkTraceOperationWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Integer durationInSeconds = null;
+        final Integer maxFrameLength = null;
+        final String sasUrl = null;
+        Observable<Response<ResponseBody>> observable = service.startWebSiteNetworkTraceOperation(resourceGroupName, name, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Object>() { }.getType());
+    }
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object startWebSiteNetworkTraceOperation(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl).toBlocking().last().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @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<Object> startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Object> startWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return startWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Object>> startWebSiteNetworkTraceOperationWithServiceResponseAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.startWebSiteNetworkTraceOperation(resourceGroupName, name, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Object>() { }.getType());
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object beginStartWebSiteNetworkTraceOperation(String resourceGroupName, String name) {
+        return beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @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<Object> beginStartWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> beginStartWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name) {
+        return beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(String resourceGroupName, String name) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Integer durationInSeconds = null;
+        final Integer maxFrameLength = null;
+        final String sasUrl = null;
+        return service.beginStartWebSiteNetworkTraceOperation(resourceGroupName, name, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = beginStartWebSiteNetworkTraceOperationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object beginStartWebSiteNetworkTraceOperation(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl).toBlocking().single().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @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<Object> beginStartWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> beginStartWebSiteNetworkTraceOperationAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> beginStartWebSiteNetworkTraceOperationWithServiceResponseAsync(String resourceGroupName, String name, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.beginStartWebSiteNetworkTraceOperation(resourceGroupName, name, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = beginStartWebSiteNetworkTraceOperationDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Object> beginStartWebSiteNetworkTraceOperationDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Object, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
+                .register(202, new TypeToken<OperationInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Stop ongoing capturing network packets for the site.
      * Stop ongoing capturing network packets for the site.
@@ -13348,12 +14463,11 @@ private ServiceResponse<String> startWebSiteNetworkTraceDelegate(Response<Respon
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @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 String object if successful.
      */
-    public String stopWebSiteNetworkTrace(String resourceGroupName, String name) {
-        return stopWebSiteNetworkTraceWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    public void stopWebSiteNetworkTrace(String resourceGroupName, String name) {
+        stopWebSiteNetworkTraceWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
     }
 
     /**
@@ -13366,7 +14480,7 @@ public String stopWebSiteNetworkTrace(String resourceGroupName, String name) {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<String> stopWebSiteNetworkTraceAsync(String resourceGroupName, String name, final ServiceCallback<String> serviceCallback) {
+    public ServiceFuture<Void> stopWebSiteNetworkTraceAsync(String resourceGroupName, String name, final ServiceCallback<Void> serviceCallback) {
         return ServiceFuture.fromResponse(stopWebSiteNetworkTraceWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
     }
 
@@ -13377,12 +14491,12 @@ public ServiceFuture<String> stopWebSiteNetworkTraceAsync(String resourceGroupNa
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<String> stopWebSiteNetworkTraceAsync(String resourceGroupName, String name) {
-        return stopWebSiteNetworkTraceWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<String>, String>() {
+    public Observable<Void> stopWebSiteNetworkTraceAsync(String resourceGroupName, String name) {
+        return stopWebSiteNetworkTraceWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public String call(ServiceResponse<String> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
@@ -13395,9 +14509,9 @@ public String call(ServiceResponse<String> response) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<String>> stopWebSiteNetworkTraceWithServiceResponseAsync(String resourceGroupName, String name) {
+    public Observable<ServiceResponse<Void>> stopWebSiteNetworkTraceWithServiceResponseAsync(String resourceGroupName, String name) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -13411,11 +14525,11 @@ public Observable<ServiceResponse<String>> stopWebSiteNetworkTraceWithServiceRes
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.stopWebSiteNetworkTrace(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<String> clientResponse = stopWebSiteNetworkTraceDelegate(response);
+                        ServiceResponse<Void> clientResponse = stopWebSiteNetworkTraceDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -13424,9 +14538,107 @@ public Observable<ServiceResponse<String>> call(Response<ResponseBody> response)
             });
     }
 
-    private ServiceResponse<String> stopWebSiteNetworkTraceDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<String, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<String>() { }.getType())
+    private ServiceResponse<Void> stopWebSiteNetworkTraceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;NetworkTraceInner&gt; object if successful.
+     */
+    public List<NetworkTraceInner> getNetworkTraces(String resourceGroupName, String name, String operationId) {
+        return getNetworkTracesWithServiceResponseAsync(resourceGroupName, name, operationId).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @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<List<NetworkTraceInner>> getNetworkTracesAsync(String resourceGroupName, String name, String operationId, final ServiceCallback<List<NetworkTraceInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkTracesWithServiceResponseAsync(resourceGroupName, name, operationId), serviceCallback);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;NetworkTraceInner&gt; object
+     */
+    public Observable<List<NetworkTraceInner>> getNetworkTracesAsync(String resourceGroupName, String name, String operationId) {
+        return getNetworkTracesWithServiceResponseAsync(resourceGroupName, name, operationId).map(new Func1<ServiceResponse<List<NetworkTraceInner>>, List<NetworkTraceInner>>() {
+            @Override
+            public List<NetworkTraceInner> call(ServiceResponse<List<NetworkTraceInner>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;NetworkTraceInner&gt; object
+     */
+    public Observable<ServiceResponse<List<NetworkTraceInner>>> getNetworkTracesWithServiceResponseAsync(String resourceGroupName, String name, String operationId) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (operationId == null) {
+            throw new IllegalArgumentException("Parameter operationId is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getNetworkTraces(resourceGroupName, name, operationId, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<NetworkTraceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<NetworkTraceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<List<NetworkTraceInner>> clientResponse = getNetworkTracesDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<List<NetworkTraceInner>> getNetworkTracesDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<List<NetworkTraceInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
@@ -13649,7 +14861,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(Response<Res
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -13671,7 +14883,7 @@ public Page<PerfMonResponseInner> nextPage(String nextPageLink) {
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -13694,7 +14906,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(String nextP
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;PerfMonResponseInner&gt; object
      */
@@ -13714,7 +14926,7 @@ public Page<PerfMonResponseInner> call(ServiceResponse<Page<PerfMonResponseInner
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;PerfMonResponseInner&gt; object
      */
@@ -13738,7 +14950,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(ServiceRespo
      *
     ServiceResponse<PageImpl<PerfMonResponseInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<PerfMonResponseInner>> * @param name Name of web app.
-    ServiceResponse<PageImpl<PerfMonResponseInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<PerfMonResponseInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;PerfMonResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -14254,6 +15466,111 @@ private ServiceResponse<Void> deletePremierAddOnDelegate(Response<ResponseBody>
                 .build(response);
     }
 
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PremierAddOnInner object if successful.
+     */
+    public PremierAddOnInner updatePremierAddOn(String resourceGroupName, String name, String premierAddOnName, PremierAddOnPatchResource premierAddOn) {
+        return updatePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @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<PremierAddOnInner> updatePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnPatchResource premierAddOn, final ServiceCallback<PremierAddOnInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updatePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn), serviceCallback);
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PremierAddOnInner object
+     */
+    public Observable<PremierAddOnInner> updatePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnPatchResource premierAddOn) {
+        return updatePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn).map(new Func1<ServiceResponse<PremierAddOnInner>, PremierAddOnInner>() {
+            @Override
+            public PremierAddOnInner call(ServiceResponse<PremierAddOnInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PremierAddOnInner object
+     */
+    public Observable<ServiceResponse<PremierAddOnInner>> updatePremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnPatchResource premierAddOn) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (premierAddOnName == null) {
+            throw new IllegalArgumentException("Parameter premierAddOnName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (premierAddOn == null) {
+            throw new IllegalArgumentException("Parameter premierAddOn is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(premierAddOn);
+        return service.updatePremierAddOn(resourceGroupName, name, premierAddOnName, this.client.subscriptionId(), premierAddOn, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PremierAddOnInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PremierAddOnInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PremierAddOnInner> clientResponse = updatePremierAddOnDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PremierAddOnInner> updatePremierAddOnDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PremierAddOnInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PremierAddOnInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
@@ -15781,13 +17098,14 @@ private ServiceResponse<Void> deletePublicCertificateDelegate(Response<ResponseB
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the InputStream object if successful.
      */
-    public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name) {
-        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions) {
+        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, publishingProfileOptions).toBlocking().single().body();
     }
 
     /**
@@ -15796,12 +17114,13 @@ public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName,
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @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<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, final ServiceCallback<InputStream> serviceCallback) {
-        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
+    public ServiceFuture<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions, final ServiceCallback<InputStream> serviceCallback) {
+        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, publishingProfileOptions), serviceCallback);
     }
 
     /**
@@ -15810,11 +17129,12 @@ public ServiceFuture<InputStream> listPublishingProfileXmlWithSecretsAsync(Strin
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the InputStream object
      */
-    public Observable<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name) {
-        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
+    public Observable<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions) {
+        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, publishingProfileOptions).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
             @Override
             public InputStream call(ServiceResponse<InputStream> response) {
                 return response.body();
@@ -15828,10 +17148,11 @@ public InputStream call(ServiceResponse<InputStream> response) {
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the InputStream object
      */
-    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name) {
+    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name, CsmPublishingProfileOptions publishingProfileOptions) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -15841,114 +17162,14 @@ public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecr
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
         }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        final PublishingProfileFormat format = null;
-        CsmPublishingProfileOptions publishingProfileOptions = new CsmPublishingProfileOptions();
-        publishingProfileOptions.withFormat(null);
-        return service.listPublishingProfileXmlWithSecrets(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), publishingProfileOptions, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InputStream>>>() {
-                @Override
-                public Observable<ServiceResponse<InputStream>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<InputStream> clientResponse = listPublishingProfileXmlWithSecretsDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
-     */
-    public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name, PublishingProfileFormat format) {
-        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format).toBlocking().single().body();
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @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<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, PublishingProfileFormat format, final ServiceCallback<InputStream> serviceCallback) {
-        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format), serviceCallback);
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the InputStream object
-     */
-    public Observable<InputStream> listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, PublishingProfileFormat format) {
-        return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
-            @Override
-            public InputStream call(ServiceResponse<InputStream> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the InputStream object
-     */
-    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name, PublishingProfileFormat format) {
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        if (publishingProfileOptions == null) {
+            throw new IllegalArgumentException("Parameter publishingProfileOptions is required and cannot be null.");
         }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        CsmPublishingProfileOptions publishingProfileOptions = new CsmPublishingProfileOptions();
-        publishingProfileOptions.withFormat(format);
-        return service.listPublishingProfileXmlWithSecrets(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), publishingProfileOptions, this.client.userAgent())
+        Validator.validate(publishingProfileOptions);
+        return service.listPublishingProfileXmlWithSecrets(resourceGroupName, name, this.client.subscriptionId(), publishingProfileOptions, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InputStream>>>() {
                 @Override
                 public Observable<ServiceResponse<InputStream>> call(Response<ResponseBody> response) {
@@ -18536,111 +19757,6 @@ private ServiceResponse<PageImpl<BackupItemInner>> listBackupsSlotDelegate(Respo
                 .build(response);
     }
 
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the RestoreRequestInner object if successful.
-     */
-    public RestoreRequestInner discoverRestoreSlot(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
-        return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().body();
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @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<RestoreRequestInner> discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request, final ServiceCallback<RestoreRequestInner> serviceCallback) {
-        return ServiceFuture.fromResponse(discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback);
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RestoreRequestInner object
-     */
-    public Observable<RestoreRequestInner> discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
-        return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1<ServiceResponse<RestoreRequestInner>, RestoreRequestInner>() {
-            @Override
-            public RestoreRequestInner call(ServiceResponse<RestoreRequestInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     * Discovers an existing app backup that can be restored from a blob in Azure storage.
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
-     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RestoreRequestInner object
-     */
-    public Observable<ServiceResponse<RestoreRequestInner>> discoverRestoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
-        }
-        if (slot == null) {
-            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
-        }
-        if (request == null) {
-            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
-        }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        Validator.validate(request);
-        return service.discoverRestoreSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RestoreRequestInner>>>() {
-                @Override
-                public Observable<ServiceResponse<RestoreRequestInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<RestoreRequestInner> clientResponse = discoverRestoreSlotDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
-    private ServiceResponse<RestoreRequestInner> discoverRestoreSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<RestoreRequestInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<RestoreRequestInner>() { }.getType())
-                .registerError(DefaultErrorResponseException.class)
-                .build(response);
-    }
-
     /**
      * Gets a backup of an app by its ID.
      * Gets a backup of an app by its ID.
@@ -19707,6 +20823,208 @@ private ServiceResponse<SiteAuthSettingsInner> getAuthSettingsSlotDelegate(Respo
                 .build(response);
     }
 
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the AzureStoragePropertyDictionaryResourceInner object if successful.
+     */
+    public AzureStoragePropertyDictionaryResourceInner updateAzureStorageAccountsSlot(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        return updateAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot, azureStorageAccounts).toBlocking().single().body();
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @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<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts, final ServiceCallback<AzureStoragePropertyDictionaryResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot, azureStorageAccounts), serviceCallback);
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        return updateAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot, azureStorageAccounts).map(new Func1<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>, AzureStoragePropertyDictionaryResourceInner>() {
+            @Override
+            public AzureStoragePropertyDictionaryResourceInner call(ServiceResponse<AzureStoragePropertyDictionaryResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates the Azure storage account configurations of an app.
+     * Updates the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @param azureStorageAccounts Azure storage accounts of the app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> updateAzureStorageAccountsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, AzureStoragePropertyDictionaryResourceInner azureStorageAccounts) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (azureStorageAccounts == null) {
+            throw new IllegalArgumentException("Parameter azureStorageAccounts is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(azureStorageAccounts);
+        return service.updateAzureStorageAccountsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), azureStorageAccounts, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureStoragePropertyDictionaryResourceInner> clientResponse = updateAzureStorageAccountsSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureStoragePropertyDictionaryResourceInner> updateAzureStorageAccountsSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureStoragePropertyDictionaryResourceInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureStoragePropertyDictionaryResourceInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the AzureStoragePropertyDictionaryResourceInner object if successful.
+     */
+    public AzureStoragePropertyDictionaryResourceInner listAzureStorageAccountsSlot(String resourceGroupName, String name, String slot) {
+        return listAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @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<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<AzureStoragePropertyDictionaryResourceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsSlotAsync(String resourceGroupName, String name, String slot) {
+        return listAzureStorageAccountsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>, AzureStoragePropertyDictionaryResourceInner>() {
+            @Override
+            public AzureStoragePropertyDictionaryResourceInner call(ServiceResponse<AzureStoragePropertyDictionaryResourceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the Azure storage account configurations of an app.
+     * Gets the Azure storage account configurations of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the Azure storage account configurations for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the AzureStoragePropertyDictionaryResourceInner object
+     */
+    public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> listAzureStorageAccountsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listAzureStorageAccountsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<AzureStoragePropertyDictionaryResourceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<AzureStoragePropertyDictionaryResourceInner> clientResponse = listAzureStorageAccountsSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<AzureStoragePropertyDictionaryResourceInner> listAzureStorageAccountsSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureStoragePropertyDictionaryResourceInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AzureStoragePropertyDictionaryResourceInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Updates the backup configuration of an app.
      * Updates the backup configuration of an app.
@@ -20990,6 +22308,426 @@ private ServiceResponse<PushSettingsInner> listSitePushSettingsSlotDelegate(Resp
                 .build(response);
     }
 
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner getSwiftVirtualNetworkConnectionSlot(String resourceGroupName, String name, String slot) {
+        return getSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network.
+     * @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<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot) {
+        return getSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a Swift Virtual Network connection.
+     * Gets a Swift Virtual Network connection.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> getSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getSwiftVirtualNetworkConnectionSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = getSwiftVirtualNetworkConnectionSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner createOrUpdateSwiftVirtualNetworkConnectionSlot(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        return createOrUpdateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope).toBlocking().single().body();
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @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<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope), serviceCallback);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        return createOrUpdateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> createOrUpdateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (connectionEnvelope == null) {
+            throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(connectionEnvelope);
+        return service.createOrUpdateSwiftVirtualNetworkConnectionSlot(resourceGroupName, name, slot, this.client.subscriptionId(), connectionEnvelope, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = createOrUpdateSwiftVirtualNetworkConnectionSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot.
+     * @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
+     */
+    public void deleteSwiftVirtualNetworkSlot(String resourceGroupName, String name, String slot) {
+        deleteSwiftVirtualNetworkSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot.
+     * @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<Void> deleteSwiftVirtualNetworkSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteSwiftVirtualNetworkSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteSwiftVirtualNetworkSlotAsync(String resourceGroupName, String name, String slot) {
+        return deleteSwiftVirtualNetworkSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     * Deletes a Swift Virtual Network connection from an app (or deployment slot).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteSwiftVirtualNetworkSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.deleteSwiftVirtualNetworkSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteSwiftVirtualNetworkSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteSwiftVirtualNetworkSlotDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(404, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SwiftVirtualNetworkInner object if successful.
+     */
+    public SwiftVirtualNetworkInner updateSwiftVirtualNetworkConnectionSlot(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        return updateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope).toBlocking().single().body();
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @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<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope, final ServiceCallback<SwiftVirtualNetworkInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope), serviceCallback);
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionSlotAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        return updateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionEnvelope).map(new Func1<ServiceResponse<SwiftVirtualNetworkInner>, SwiftVirtualNetworkInner>() {
+            @Override
+            public SwiftVirtualNetworkInner call(ServiceResponse<SwiftVirtualNetworkInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     * Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not
+     in use by another App Service Plan other than the one this App is in.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot.
+     * @param connectionEnvelope Properties of the Virtual Network connection. See example.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SwiftVirtualNetworkInner object
+     */
+    public Observable<ServiceResponse<SwiftVirtualNetworkInner>> updateSwiftVirtualNetworkConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SwiftVirtualNetworkInner connectionEnvelope) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (connectionEnvelope == null) {
+            throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(connectionEnvelope);
+        return service.updateSwiftVirtualNetworkConnectionSlot(resourceGroupName, name, slot, this.client.subscriptionId(), connectionEnvelope, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SwiftVirtualNetworkInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SwiftVirtualNetworkInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SwiftVirtualNetworkInner> clientResponse = updateSwiftVirtualNetworkConnectionSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SwiftVirtualNetworkInner> updateSwiftVirtualNetworkConnectionSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SwiftVirtualNetworkInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SwiftVirtualNetworkInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
      * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc.
@@ -22949,6 +24687,111 @@ private ServiceResponse<DeploymentInner> listDeploymentLogSlotDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RestoreRequestInner object if successful.
+     */
+    public RestoreRequestInner discoverBackupSlot(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
+        return discoverBackupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().body();
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @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<RestoreRequestInner> discoverBackupSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request, final ServiceCallback<RestoreRequestInner> serviceCallback) {
+        return ServiceFuture.fromResponse(discoverBackupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback);
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestoreRequestInner object
+     */
+    public Observable<RestoreRequestInner> discoverBackupSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
+        return discoverBackupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1<ServiceResponse<RestoreRequestInner>, RestoreRequestInner>() {
+            @Override
+            public RestoreRequestInner call(ServiceResponse<RestoreRequestInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     * Discovers an existing app backup that can be restored from a blob in Azure storage. Use this to get information about the databases stored in a backup.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot.
+     * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RestoreRequestInner object
+     */
+    public Observable<ServiceResponse<RestoreRequestInner>> discoverBackupSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (request == null) {
+            throw new IllegalArgumentException("Parameter request is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(request);
+        return service.discoverBackupSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RestoreRequestInner>>>() {
+                @Override
+                public Observable<ServiceResponse<RestoreRequestInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<RestoreRequestInner> clientResponse = discoverBackupSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<RestoreRequestInner> discoverBackupSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RestoreRequestInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RestoreRequestInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Lists ownership identifiers for domain associated with web app.
      * Lists ownership identifiers for domain associated with web app.
@@ -28359,7 +30202,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(Response<Resp
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -28383,7 +30226,7 @@ public Page<ResourceMetricInner> nextPage(String nextPageLink) {
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -28408,7 +30251,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(String nextPa
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -28430,7 +30273,7 @@ public Page<ResourceMetricInner> call(ServiceResponse<Page<ResourceMetricInner>>
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot.
      * @param details Specify "true" to include metric details in the response. It is "false" by default.
-     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ResourceMetricInner&gt; object
      */
@@ -28456,7 +30299,7 @@ public Observable<ServiceResponse<Page<ResourceMetricInner>>> call(ServiceRespon
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param name Name of the app.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot.
     ServiceResponse<PageImpl<ResourceMetricInner>> * @param details Specify "true" to include metric details in the response. It is "false" by default.
-    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<ResourceMetricInner>> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceMetricInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -28700,8 +30543,113 @@ private ServiceResponse<NetworkFeaturesInner> listNetworkFeaturesSlotDelegate(Re
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object getNetworkTraceOperationSlot(String resourceGroupName, String name, String operationId, String slot) {
+        return getNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @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<Object> getNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot), serviceCallback);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> getNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot) {
+        return getNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> getNetworkTraceOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String operationId, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (operationId == null) {
+            throw new IllegalArgumentException("Parameter operationId is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getNetworkTraceOperationSlot(resourceGroupName, name, operationId, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = getNetworkTraceOperationSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Object> getNetworkTraceOperationSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Object, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
+                .register(202, new TypeToken<OperationInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28716,8 +30664,8 @@ public String startWebSiteNetworkTraceSlot(String resourceGroupName, String name
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28731,8 +30679,8 @@ public ServiceFuture<String> startWebSiteNetworkTraceSlotAsync(String resourceGr
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28750,8 +30698,8 @@ public String call(ServiceResponse<String> response) {
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28793,8 +30741,8 @@ public Observable<ServiceResponse<String>> call(Response<ResponseBody> response)
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28812,8 +30760,8 @@ public String startWebSiteNetworkTraceSlot(String resourceGroupName, String name
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28830,8 +30778,8 @@ public ServiceFuture<String> startWebSiteNetworkTraceSlotAsync(String resourceGr
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28852,8 +30800,8 @@ public String call(ServiceResponse<String> response) {
     }
 
     /**
-     * Start capturing network packets for the site.
-     * Start capturing network packets for the site.
+     * Start capturing network packets for the site (To be deprecated).
+     * Start capturing network packets for the site (To be deprecated).
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name The name of the web app.
@@ -28901,6 +30849,383 @@ private ServiceResponse<String> startWebSiteNetworkTraceSlotDelegate(Response<Re
                 .build(response);
     }
 
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object startWebSiteNetworkTraceOperationSlot(String resourceGroupName, String name, String slot) {
+        return startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().last().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @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<Object> startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Object> startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot) {
+        return startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Object>> startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Integer durationInSeconds = null;
+        final Integer maxFrameLength = null;
+        final String sasUrl = null;
+        Observable<Response<ResponseBody>> observable = service.startWebSiteNetworkTraceOperationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Object>() { }.getType());
+    }
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object startWebSiteNetworkTraceOperationSlot(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl).toBlocking().last().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @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<Object> startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Object> startWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Object>> startWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.startWebSiteNetworkTraceOperationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Object>() { }.getType());
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object beginStartWebSiteNetworkTraceOperationSlot(String resourceGroupName, String name, String slot) {
+        return beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @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<Object> beginStartWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> beginStartWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot) {
+        return beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final Integer durationInSeconds = null;
+        final Integer maxFrameLength = null;
+        final String sasUrl = null;
+        return service.beginStartWebSiteNetworkTraceOperationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = beginStartWebSiteNetworkTraceOperationSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the Object object if successful.
+     */
+    public Object beginStartWebSiteNetworkTraceOperationSlot(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl).toBlocking().single().body();
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @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<Object> beginStartWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl, final ServiceCallback<Object> serviceCallback) {
+        return ServiceFuture.fromResponse(beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl), serviceCallback);
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<Object> beginStartWebSiteNetworkTraceOperationSlotAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        return beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(resourceGroupName, name, slot, durationInSeconds, maxFrameLength, sasUrl).map(new Func1<ServiceResponse<Object>, Object>() {
+            @Override
+            public Object call(ServiceResponse<Object> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Start capturing network packets for the site.
+     * Start capturing network packets for the site.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name The name of the web app.
+     * @param slot The name of the slot for this web app.
+     * @param durationInSeconds The duration to keep capturing in seconds.
+     * @param maxFrameLength The maximum frame length in bytes (Optional).
+     * @param sasUrl The Blob URL to store capture file.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the Object object
+     */
+    public Observable<ServiceResponse<Object>> beginStartWebSiteNetworkTraceOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Integer durationInSeconds, Integer maxFrameLength, String sasUrl) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.beginStartWebSiteNetworkTraceOperationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), durationInSeconds, maxFrameLength, sasUrl, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+                @Override
+                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Object> clientResponse = beginStartWebSiteNetworkTraceOperationSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Object> beginStartWebSiteNetworkTraceOperationSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Object, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
+                .register(202, new TypeToken<OperationInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Stop ongoing capturing network packets for the site.
      * Stop ongoing capturing network packets for the site.
@@ -28909,12 +31234,11 @@ private ServiceResponse<String> startWebSiteNetworkTraceSlotDelegate(Response<Re
      * @param name The name of the web app.
      * @param slot The name of the slot for this web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @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 String object if successful.
      */
-    public String stopWebSiteNetworkTraceSlot(String resourceGroupName, String name, String slot) {
-        return stopWebSiteNetworkTraceSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    public void stopWebSiteNetworkTraceSlot(String resourceGroupName, String name, String slot) {
+        stopWebSiteNetworkTraceSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
     }
 
     /**
@@ -28928,7 +31252,7 @@ public String stopWebSiteNetworkTraceSlot(String resourceGroupName, String name,
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<String> stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<String> serviceCallback) {
+    public ServiceFuture<Void> stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Void> serviceCallback) {
         return ServiceFuture.fromResponse(stopWebSiteNetworkTraceSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
     }
 
@@ -28940,12 +31264,12 @@ public ServiceFuture<String> stopWebSiteNetworkTraceSlotAsync(String resourceGro
      * @param name The name of the web app.
      * @param slot The name of the slot for this web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<String> stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot) {
-        return stopWebSiteNetworkTraceSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<String>, String>() {
+    public Observable<Void> stopWebSiteNetworkTraceSlotAsync(String resourceGroupName, String name, String slot) {
+        return stopWebSiteNetworkTraceSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public String call(ServiceResponse<String> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
@@ -28959,9 +31283,9 @@ public String call(ServiceResponse<String> response) {
      * @param name The name of the web app.
      * @param slot The name of the slot for this web app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<String>> stopWebSiteNetworkTraceSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+    public Observable<ServiceResponse<Void>> stopWebSiteNetworkTraceSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -28978,11 +31302,11 @@ public Observable<ServiceResponse<String>> stopWebSiteNetworkTraceSlotWithServic
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.stopWebSiteNetworkTraceSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<String> clientResponse = stopWebSiteNetworkTraceSlotDelegate(response);
+                        ServiceResponse<Void> clientResponse = stopWebSiteNetworkTraceSlotDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -28991,9 +31315,114 @@ public Observable<ServiceResponse<String>> call(Response<ResponseBody> response)
             });
     }
 
-    private ServiceResponse<String> stopWebSiteNetworkTraceSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<String, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<String>() { }.getType())
+    private ServiceResponse<Void> stopWebSiteNetworkTraceSlotDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;NetworkTraceInner&gt; object if successful.
+     */
+    public List<NetworkTraceInner> getNetworkTracesSlot(String resourceGroupName, String name, String operationId, String slot) {
+        return getNetworkTracesSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @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<List<NetworkTraceInner>> getNetworkTracesSlotAsync(String resourceGroupName, String name, String operationId, String slot, final ServiceCallback<List<NetworkTraceInner>> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkTracesSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot), serviceCallback);
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;NetworkTraceInner&gt; object
+     */
+    public Observable<List<NetworkTraceInner>> getNetworkTracesSlotAsync(String resourceGroupName, String name, String operationId, String slot) {
+        return getNetworkTracesSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).map(new Func1<ServiceResponse<List<NetworkTraceInner>>, List<NetworkTraceInner>>() {
+            @Override
+            public List<NetworkTraceInner> call(ServiceResponse<List<NetworkTraceInner>> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     * Gets a named operation for a network trace capturing (or deployment slot, if specified).
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param operationId GUID of the operation.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will get an operation for the production slot.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;NetworkTraceInner&gt; object
+     */
+    public Observable<ServiceResponse<List<NetworkTraceInner>>> getNetworkTracesSlotWithServiceResponseAsync(String resourceGroupName, String name, String operationId, String slot) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (operationId == null) {
+            throw new IllegalArgumentException("Parameter operationId is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.getNetworkTracesSlot(resourceGroupName, name, operationId, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<NetworkTraceInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<List<NetworkTraceInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<List<NetworkTraceInner>> clientResponse = getNetworkTracesSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<List<NetworkTraceInner>> getNetworkTracesSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<List<NetworkTraceInner>, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<List<NetworkTraceInner>>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
@@ -29232,7 +31661,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(Response<Res
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
      * @param slot Name of web app slot. If not specified then will default to production slot.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -29255,7 +31684,7 @@ public Page<PerfMonResponseInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
      * @param slot Name of web app slot. If not specified then will default to production slot.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -29279,7 +31708,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(String nextP
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
      * @param slot Name of web app slot. If not specified then will default to production slot.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;PerfMonResponseInner&gt; object
      */
@@ -29300,7 +31729,7 @@ public Page<PerfMonResponseInner> call(ServiceResponse<Page<PerfMonResponseInner
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of web app.
      * @param slot Name of web app slot. If not specified then will default to production slot.
-     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;PerfMonResponseInner&gt; object
      */
@@ -29325,7 +31754,7 @@ public Observable<ServiceResponse<Page<PerfMonResponseInner>>> call(ServiceRespo
     ServiceResponse<PageImpl<PerfMonResponseInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<PerfMonResponseInner>> * @param name Name of web app.
     ServiceResponse<PageImpl<PerfMonResponseInner>> * @param slot Name of web app slot. If not specified then will default to production slot.
-    ServiceResponse<PageImpl<PerfMonResponseInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<PerfMonResponseInner>> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;PerfMonResponseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -29879,6 +32308,118 @@ private ServiceResponse<Void> deletePremierAddOnSlotDelegate(Response<ResponseBo
                 .build(response);
     }
 
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws DefaultErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PremierAddOnInner object if successful.
+     */
+    public PremierAddOnInner updatePremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn) {
+        return updatePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn).toBlocking().single().body();
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @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<PremierAddOnInner> updatePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn, final ServiceCallback<PremierAddOnInner> serviceCallback) {
+        return ServiceFuture.fromResponse(updatePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn), serviceCallback);
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PremierAddOnInner object
+     */
+    public Observable<PremierAddOnInner> updatePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn) {
+        return updatePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn).map(new Func1<ServiceResponse<PremierAddOnInner>, PremierAddOnInner>() {
+            @Override
+            public PremierAddOnInner call(ServiceResponse<PremierAddOnInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates a named add-on of an app.
+     * Updates a named add-on of an app.
+     *
+     * @param resourceGroupName Name of the resource group to which the resource belongs.
+     * @param name Name of the app.
+     * @param premierAddOnName Add-on name.
+     * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot.
+     * @param premierAddOn A JSON representation of the edited premier add-on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PremierAddOnInner object
+     */
+    public Observable<ServiceResponse<PremierAddOnInner>> updatePremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnPatchResource premierAddOn) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        if (premierAddOnName == null) {
+            throw new IllegalArgumentException("Parameter premierAddOnName is required and cannot be null.");
+        }
+        if (slot == null) {
+            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (premierAddOn == null) {
+            throw new IllegalArgumentException("Parameter premierAddOn is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(premierAddOn);
+        return service.updatePremierAddOnSlot(resourceGroupName, name, premierAddOnName, slot, this.client.subscriptionId(), premierAddOn, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PremierAddOnInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PremierAddOnInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PremierAddOnInner> clientResponse = updatePremierAddOnSlotDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PremierAddOnInner> updatePremierAddOnSlotDelegate(Response<ResponseBody> response) throws DefaultErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PremierAddOnInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PremierAddOnInner>() { }.getType())
+                .registerError(DefaultErrorResponseException.class)
+                .build(response);
+    }
+
     /**
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
      * Gets data around private site access enablement and authorized Virtual Networks that can access the site.
@@ -31509,13 +34050,14 @@ private ServiceResponse<Void> deletePublicCertificateSlotDelegate(Response<Respo
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the InputStream object if successful.
      */
-    public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot) {
-        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions) {
+        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, publishingProfileOptions).toBlocking().single().body();
     }
 
     /**
@@ -31525,12 +34067,13 @@ public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupN
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @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<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<InputStream> serviceCallback) {
-        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
+    public ServiceFuture<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions, final ServiceCallback<InputStream> serviceCallback) {
+        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, publishingProfileOptions), serviceCallback);
     }
 
     /**
@@ -31540,11 +34083,12 @@ public ServiceFuture<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(S
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the InputStream object
      */
-    public Observable<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot) {
-        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
+    public Observable<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions) {
+        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, publishingProfileOptions).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
             @Override
             public InputStream call(ServiceResponse<InputStream> response) {
                 return response.body();
@@ -31559,10 +34103,11 @@ public InputStream call(ServiceResponse<InputStream> response) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
+     * @param publishingProfileOptions Specifies publishingProfileOptions for publishing profile. For example, use {"format": "FileZilla3"} to get a FileZilla publishing profile.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the InputStream object
      */
-    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmPublishingProfileOptions publishingProfileOptions) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -31575,121 +34120,14 @@ public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecr
         if (this.client.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
         }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        final PublishingProfileFormat format = null;
-        CsmPublishingProfileOptions publishingProfileOptions = new CsmPublishingProfileOptions();
-        publishingProfileOptions.withFormat(null);
-        return service.listPublishingProfileXmlWithSecretsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), publishingProfileOptions, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InputStream>>>() {
-                @Override
-                public Observable<ServiceResponse<InputStream>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<InputStream> clientResponse = listPublishingProfileXmlWithSecretsSlotDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws DefaultErrorResponseException thrown if the request is rejected by server
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
-     */
-    public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot, PublishingProfileFormat format) {
-        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format).toBlocking().single().body();
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @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<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format, final ServiceCallback<InputStream> serviceCallback) {
-        return ServiceFuture.fromResponse(listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format), serviceCallback);
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the InputStream object
-     */
-    public Observable<InputStream> listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format) {
-        return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format).map(new Func1<ServiceResponse<InputStream>, InputStream>() {
-            @Override
-            public InputStream call(ServiceResponse<InputStream> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     * Gets the publishing profile for an app (or deployment slot, if specified).
-     *
-     * @param resourceGroupName Name of the resource group to which the resource belongs.
-     * @param name Name of the app.
-     * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot.
-     * @param format Name of the format. Valid values are:
-     FileZilla3
-     WebDeploy -- default
-     Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the InputStream object
-     */
-    public Observable<ServiceResponse<InputStream>> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format) {
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
-        if (name == null) {
-            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
-        }
-        if (slot == null) {
-            throw new IllegalArgumentException("Parameter slot is required and cannot be null.");
-        }
-        if (this.client.subscriptionId() == null) {
-            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        if (publishingProfileOptions == null) {
+            throw new IllegalArgumentException("Parameter publishingProfileOptions is required and cannot be null.");
         }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        CsmPublishingProfileOptions publishingProfileOptions = new CsmPublishingProfileOptions();
-        publishingProfileOptions.withFormat(format);
-        return service.listPublishingProfileXmlWithSecretsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), publishingProfileOptions, this.client.userAgent())
+        Validator.validate(publishingProfileOptions);
+        return service.listPublishingProfileXmlWithSecretsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), publishingProfileOptions, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<InputStream>>>() {
                 @Override
                 public Observable<ServiceResponse<InputStream>> call(Response<ResponseBody> response) {
@@ -33893,10 +36331,9 @@ private ServiceResponse<SiteSourceControlInner> beginCreateOrUpdateSourceControl
      * @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 Object object if successful.
      */
-    public Object deleteSourceControlSlot(String resourceGroupName, String name, String slot) {
-        return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
+    public void deleteSourceControlSlot(String resourceGroupName, String name, String slot) {
+        deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().body();
     }
 
     /**
@@ -33910,7 +36347,7 @@ public Object deleteSourceControlSlot(String resourceGroupName, String name, Str
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<Object> deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Object> serviceCallback) {
+    public ServiceFuture<Void> deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback<Void> serviceCallback) {
         return ServiceFuture.fromResponse(deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback);
     }
 
@@ -33922,12 +36359,12 @@ public ServiceFuture<Object> deleteSourceControlSlotAsync(String resourceGroupNa
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Object object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<Object> deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot) {
-        return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Object>, Object>() {
+    public Observable<Void> deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot) {
+        return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public Object call(ServiceResponse<Object> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
@@ -33941,9 +36378,9 @@ public Object call(ServiceResponse<Object> response) {
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Object object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<Object>> deleteSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
+    public Observable<ServiceResponse<Void>> deleteSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -33960,11 +36397,11 @@ public Observable<ServiceResponse<Object>> deleteSourceControlSlotWithServiceRes
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.deleteSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<Object> clientResponse = deleteSourceControlSlotDelegate(response);
+                        ServiceResponse<Void> clientResponse = deleteSourceControlSlotDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -33973,10 +36410,10 @@ public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response)
             });
     }
 
-    private ServiceResponse<Object> deleteSourceControlSlotDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Object, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<Object>() { }.getType())
-                .register(202, new TypeToken<Object>() { }.getType())
+    private ServiceResponse<Void> deleteSourceControlSlotDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
                 .register(404, new TypeToken<Void>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
@@ -34084,6 +36521,7 @@ private ServiceResponse<SiteSourceControlInner> updateSourceControlSlotDelegate(
         return this.client.restClient().responseBuilderFactory().<SiteSourceControlInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SiteSourceControlInner>() { }.getType())
                 .register(201, new TypeToken<SiteSourceControlInner>() { }.getType())
+                .register(202, new TypeToken<SiteSourceControlInner>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
@@ -35315,7 +37753,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(Response<Respo
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -35338,7 +37776,7 @@ public Page<CsmUsageQuotaInner> nextPage(String nextPageLink) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -35362,7 +37800,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(String nextPag
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -35383,7 +37821,7 @@ public Page<CsmUsageQuotaInner> call(ServiceResponse<Page<CsmUsageQuotaInner>> r
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -35408,7 +37846,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(ServiceRespons
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param name Name of the app.
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot.
-    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;CsmUsageQuotaInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -37293,10 +39731,9 @@ private ServiceResponse<SiteSourceControlInner> beginCreateOrUpdateSourceControl
      * @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 Object object if successful.
      */
-    public Object deleteSourceControl(String resourceGroupName, String name) {
-        return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
+    public void deleteSourceControl(String resourceGroupName, String name) {
+        deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().body();
     }
 
     /**
@@ -37309,7 +39746,7 @@ public Object deleteSourceControl(String resourceGroupName, String name) {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<Object> deleteSourceControlAsync(String resourceGroupName, String name, final ServiceCallback<Object> serviceCallback) {
+    public ServiceFuture<Void> deleteSourceControlAsync(String resourceGroupName, String name, final ServiceCallback<Void> serviceCallback) {
         return ServiceFuture.fromResponse(deleteSourceControlWithServiceResponseAsync(resourceGroupName, name), serviceCallback);
     }
 
@@ -37320,12 +39757,12 @@ public ServiceFuture<Object> deleteSourceControlAsync(String resourceGroupName,
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Object object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<Object> deleteSourceControlAsync(String resourceGroupName, String name) {
-        return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Object>, Object>() {
+    public Observable<Void> deleteSourceControlAsync(String resourceGroupName, String name) {
+        return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public Object call(ServiceResponse<Object> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
@@ -37338,9 +39775,9 @@ public Object call(ServiceResponse<Object> response) {
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Object object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<Object>> deleteSourceControlWithServiceResponseAsync(String resourceGroupName, String name) {
+    public Observable<ServiceResponse<Void>> deleteSourceControlWithServiceResponseAsync(String resourceGroupName, String name) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -37354,11 +39791,11 @@ public Observable<ServiceResponse<Object>> deleteSourceControlWithServiceRespons
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.deleteSourceControl(resourceGroupName, name, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Object>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<Object> clientResponse = deleteSourceControlDelegate(response);
+                        ServiceResponse<Void> clientResponse = deleteSourceControlDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -37367,10 +39804,10 @@ public Observable<ServiceResponse<Object>> call(Response<ResponseBody> response)
             });
     }
 
-    private ServiceResponse<Object> deleteSourceControlDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Object, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<Object>() { }.getType())
-                .register(202, new TypeToken<Object>() { }.getType())
+    private ServiceResponse<Void> deleteSourceControlDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
                 .register(404, new TypeToken<Void>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
@@ -37471,6 +39908,7 @@ private ServiceResponse<SiteSourceControlInner> updateSourceControlDelegate(Resp
         return this.client.restClient().responseBuilderFactory().<SiteSourceControlInner, DefaultErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SiteSourceControlInner>() { }.getType())
                 .register(201, new TypeToken<SiteSourceControlInner>() { }.getType())
+                .register(202, new TypeToken<SiteSourceControlInner>() { }.getType())
                 .registerError(DefaultErrorResponseException.class)
                 .build(response);
     }
@@ -38621,7 +41059,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(Response<Respo
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
@@ -38643,7 +41081,7 @@ public Page<CsmUsageQuotaInner> nextPage(String nextPageLink) {
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -38666,7 +41104,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(String nextPag
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -38686,7 +41124,7 @@ public Page<CsmUsageQuotaInner> call(ServiceResponse<Page<CsmUsageQuotaInner>> r
      *
      * @param resourceGroupName Name of the resource group to which the resource belongs.
      * @param name Name of the app.
-     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+     * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;CsmUsageQuotaInner&gt; object
      */
@@ -38710,7 +41148,7 @@ public Observable<ServiceResponse<Page<CsmUsageQuotaInner>>> call(ServiceRespons
      *
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param resourceGroupName Name of the resource group to which the resource belongs.
     ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param name Name of the app.
-    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.
+    ServiceResponse<PageImpl<CsmUsageQuotaInner>> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;CsmUsageQuotaInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebJobImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebJobImpl.java
index 39756c0dd2d6..a86cfcedd1f5 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebJobImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebJobImpl.java
@@ -15,13 +15,13 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.WebJobType;
 
 class WebJobImpl extends IndexableRefreshableWrapperImpl<WebJob, WebJobInner> implements WebJob {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String webJobName;
     private String slot;
 
-    WebJobImpl(WebJobInner inner,  AppServiceManager manager) {
+    WebJobImpl(WebJobInner inner,  CertificateRegistrationManager manager) {
         super(null, inner);
         this.manager = manager;
         this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
@@ -31,7 +31,7 @@ class WebJobImpl extends IndexableRefreshableWrapperImpl<WebJob, WebJobInner> im
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebSiteManagementClientImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebSiteManagementClientImpl.java
index 6042207d62d8..08a463b4fd23 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebSiteManagementClientImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WebSiteManagementClientImpl.java
@@ -335,6 +335,19 @@ public AppServicePlansInner appServicePlans() {
         return this.appServicePlans;
     }
 
+    /**
+     * The ResourceHealthMetadatasInner object to access its operations.
+     */
+    private ResourceHealthMetadatasInner resourceHealthMetadatas;
+
+    /**
+     * Gets the ResourceHealthMetadatasInner object to access its operations.
+     * @return the ResourceHealthMetadatasInner object.
+     */
+    public ResourceHealthMetadatasInner resourceHealthMetadatas() {
+        return this.resourceHealthMetadatas;
+    }
+
     /**
      * Initializes an instance of WebSiteManagementClient client.
      *
@@ -383,6 +396,7 @@ protected void initialize() {
         this.webApps = new WebAppsInner(restClient().retrofit(), this);
         this.appServiceEnvironments = new AppServiceEnvironmentsInner(restClient().retrofit(), this);
         this.appServicePlans = new AppServicePlansInner(restClient().retrofit(), this);
+        this.resourceHealthMetadatas = new ResourceHealthMetadatasInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
         initializeService();
     }
@@ -428,7 +442,7 @@ interface WebSiteManagementClientService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebSiteManagementClient listBillingMeters" })
         @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/billingMeters")
-        Observable<Response<ResponseBody>> listBillingMeters(@Path("subscriptionId") String subscriptionId, @Query("billingLocation") String billingLocation, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listBillingMeters(@Path("subscriptionId") String subscriptionId, @Query("billingLocation") String billingLocation, @Query("osType") String osType, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebSiteManagementClient checkNameAvailability" })
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.Web/checknameavailability")
@@ -440,7 +454,7 @@ interface WebSiteManagementClientService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebSiteManagementClient listGeoRegions" })
         @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/geoRegions")
-        Observable<Response<ResponseBody>> listGeoRegions(@Path("subscriptionId") String subscriptionId, @Query("sku") SkuName sku, @Query("linuxWorkersEnabled") Boolean linuxWorkersEnabled, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listGeoRegions(@Path("subscriptionId") String subscriptionId, @Query("sku") SkuName sku, @Query("linuxWorkersEnabled") Boolean linuxWorkersEnabled, @Query("xenonWorkersEnabled") Boolean xenonWorkersEnabled, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.appservice.v2018_02_01.WebSiteManagementClient listSiteIdentifiersAssignedToHostName" })
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.Web/listSitesAssignedToHostName")
@@ -1015,7 +1029,8 @@ public Observable<ServiceResponse<Page<BillingMeterInner>>> listBillingMetersSin
             throw new IllegalArgumentException("Parameter this.apiVersion() is required and cannot be null.");
         }
         final String billingLocation = null;
-        return service.listBillingMeters(this.subscriptionId(), billingLocation, this.apiVersion(), this.acceptLanguage(), this.userAgent())
+        final String osType = null;
+        return service.listBillingMeters(this.subscriptionId(), billingLocation, osType, this.apiVersion(), this.acceptLanguage(), this.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BillingMeterInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<BillingMeterInner>>> call(Response<ResponseBody> response) {
@@ -1034,13 +1049,14 @@ public Observable<ServiceResponse<Page<BillingMeterInner>>> call(Response<Respon
      * Gets a list of meters for a given location.
      *
      * @param billingLocation Azure Location of billable resource
+     * @param osType App Service OS type meters used for
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;BillingMeterInner&gt; object if successful.
      */
-    public PagedList<BillingMeterInner> listBillingMeters(final String billingLocation) {
-        ServiceResponse<Page<BillingMeterInner>> response = listBillingMetersSinglePageAsync(billingLocation).toBlocking().single();
+    public PagedList<BillingMeterInner> listBillingMeters(final String billingLocation, final String osType) {
+        ServiceResponse<Page<BillingMeterInner>> response = listBillingMetersSinglePageAsync(billingLocation, osType).toBlocking().single();
         return new PagedList<BillingMeterInner>(response.body()) {
             @Override
             public Page<BillingMeterInner> nextPage(String nextPageLink) {
@@ -1054,13 +1070,14 @@ public Page<BillingMeterInner> nextPage(String nextPageLink) {
      * Gets a list of meters for a given location.
      *
      * @param billingLocation Azure Location of billable resource
+     * @param osType App Service OS type meters used for
      * @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<List<BillingMeterInner>> listBillingMetersAsync(final String billingLocation, final ListOperationCallback<BillingMeterInner> serviceCallback) {
+    public ServiceFuture<List<BillingMeterInner>> listBillingMetersAsync(final String billingLocation, final String osType, final ListOperationCallback<BillingMeterInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listBillingMetersSinglePageAsync(billingLocation),
+            listBillingMetersSinglePageAsync(billingLocation, osType),
             new Func1<String, Observable<ServiceResponse<Page<BillingMeterInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<BillingMeterInner>>> call(String nextPageLink) {
@@ -1075,11 +1092,12 @@ public Observable<ServiceResponse<Page<BillingMeterInner>>> call(String nextPage
      * Gets a list of meters for a given location.
      *
      * @param billingLocation Azure Location of billable resource
+     * @param osType App Service OS type meters used for
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;BillingMeterInner&gt; object
      */
-    public Observable<Page<BillingMeterInner>> listBillingMetersAsync(final String billingLocation) {
-        return listBillingMetersWithServiceResponseAsync(billingLocation)
+    public Observable<Page<BillingMeterInner>> listBillingMetersAsync(final String billingLocation, final String osType) {
+        return listBillingMetersWithServiceResponseAsync(billingLocation, osType)
             .map(new Func1<ServiceResponse<Page<BillingMeterInner>>, Page<BillingMeterInner>>() {
                 @Override
                 public Page<BillingMeterInner> call(ServiceResponse<Page<BillingMeterInner>> response) {
@@ -1093,11 +1111,12 @@ public Page<BillingMeterInner> call(ServiceResponse<Page<BillingMeterInner>> res
      * Gets a list of meters for a given location.
      *
      * @param billingLocation Azure Location of billable resource
+     * @param osType App Service OS type meters used for
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;BillingMeterInner&gt; object
      */
-    public Observable<ServiceResponse<Page<BillingMeterInner>>> listBillingMetersWithServiceResponseAsync(final String billingLocation) {
-        return listBillingMetersSinglePageAsync(billingLocation)
+    public Observable<ServiceResponse<Page<BillingMeterInner>>> listBillingMetersWithServiceResponseAsync(final String billingLocation, final String osType) {
+        return listBillingMetersSinglePageAsync(billingLocation, osType)
             .concatMap(new Func1<ServiceResponse<Page<BillingMeterInner>>, Observable<ServiceResponse<Page<BillingMeterInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<BillingMeterInner>>> call(ServiceResponse<Page<BillingMeterInner>> page) {
@@ -1115,17 +1134,18 @@ public Observable<ServiceResponse<Page<BillingMeterInner>>> call(ServiceResponse
      * Gets a list of meters for a given location.
      *
     ServiceResponse<PageImpl<BillingMeterInner>> * @param billingLocation Azure Location of billable resource
+    ServiceResponse<PageImpl<BillingMeterInner>> * @param osType App Service OS type meters used for
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;BillingMeterInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<BillingMeterInner>>> listBillingMetersSinglePageAsync(final String billingLocation) {
+    public Observable<ServiceResponse<Page<BillingMeterInner>>> listBillingMetersSinglePageAsync(final String billingLocation, final String osType) {
         if (this.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
         }
         if (this.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.apiVersion() is required and cannot be null.");
         }
-        return service.listBillingMeters(this.subscriptionId(), billingLocation, this.apiVersion(), this.acceptLanguage(), this.userAgent())
+        return service.listBillingMeters(this.subscriptionId(), billingLocation, osType, this.apiVersion(), this.acceptLanguage(), this.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<BillingMeterInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<BillingMeterInner>>> call(Response<ResponseBody> response) {
@@ -1501,7 +1521,8 @@ public Observable<ServiceResponse<Page<GeoRegionInner>>> listGeoRegionsSinglePag
         }
         final SkuName sku = null;
         final Boolean linuxWorkersEnabled = null;
-        return service.listGeoRegions(this.subscriptionId(), sku, linuxWorkersEnabled, this.apiVersion(), this.acceptLanguage(), this.userAgent())
+        final Boolean xenonWorkersEnabled = null;
+        return service.listGeoRegions(this.subscriptionId(), sku, linuxWorkersEnabled, xenonWorkersEnabled, this.apiVersion(), this.acceptLanguage(), this.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<GeoRegionInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<GeoRegionInner>>> call(Response<ResponseBody> response) {
@@ -1521,13 +1542,14 @@ public Observable<ServiceResponse<Page<GeoRegionInner>>> call(Response<ResponseB
      *
      * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', 'Isolated', 'PremiumV2'
      * @param linuxWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Linux workers.
+     * @param xenonWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Xenon workers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws DefaultErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PagedList&lt;GeoRegionInner&gt; object if successful.
      */
-    public PagedList<GeoRegionInner> listGeoRegions(final SkuName sku, final Boolean linuxWorkersEnabled) {
-        ServiceResponse<Page<GeoRegionInner>> response = listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled).toBlocking().single();
+    public PagedList<GeoRegionInner> listGeoRegions(final SkuName sku, final Boolean linuxWorkersEnabled, final Boolean xenonWorkersEnabled) {
+        ServiceResponse<Page<GeoRegionInner>> response = listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled, xenonWorkersEnabled).toBlocking().single();
         return new PagedList<GeoRegionInner>(response.body()) {
             @Override
             public Page<GeoRegionInner> nextPage(String nextPageLink) {
@@ -1542,13 +1564,14 @@ public Page<GeoRegionInner> nextPage(String nextPageLink) {
      *
      * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', 'Isolated', 'PremiumV2'
      * @param linuxWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Linux workers.
+     * @param xenonWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Xenon workers.
      * @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<List<GeoRegionInner>> listGeoRegionsAsync(final SkuName sku, final Boolean linuxWorkersEnabled, final ListOperationCallback<GeoRegionInner> serviceCallback) {
+    public ServiceFuture<List<GeoRegionInner>> listGeoRegionsAsync(final SkuName sku, final Boolean linuxWorkersEnabled, final Boolean xenonWorkersEnabled, final ListOperationCallback<GeoRegionInner> serviceCallback) {
         return AzureServiceFuture.fromPageResponse(
-            listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled),
+            listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled, xenonWorkersEnabled),
             new Func1<String, Observable<ServiceResponse<Page<GeoRegionInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<GeoRegionInner>>> call(String nextPageLink) {
@@ -1564,11 +1587,12 @@ public Observable<ServiceResponse<Page<GeoRegionInner>>> call(String nextPageLin
      *
      * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', 'Isolated', 'PremiumV2'
      * @param linuxWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Linux workers.
+     * @param xenonWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Xenon workers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;GeoRegionInner&gt; object
      */
-    public Observable<Page<GeoRegionInner>> listGeoRegionsAsync(final SkuName sku, final Boolean linuxWorkersEnabled) {
-        return listGeoRegionsWithServiceResponseAsync(sku, linuxWorkersEnabled)
+    public Observable<Page<GeoRegionInner>> listGeoRegionsAsync(final SkuName sku, final Boolean linuxWorkersEnabled, final Boolean xenonWorkersEnabled) {
+        return listGeoRegionsWithServiceResponseAsync(sku, linuxWorkersEnabled, xenonWorkersEnabled)
             .map(new Func1<ServiceResponse<Page<GeoRegionInner>>, Page<GeoRegionInner>>() {
                 @Override
                 public Page<GeoRegionInner> call(ServiceResponse<Page<GeoRegionInner>> response) {
@@ -1583,11 +1607,12 @@ public Page<GeoRegionInner> call(ServiceResponse<Page<GeoRegionInner>> response)
      *
      * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', 'Isolated', 'PremiumV2'
      * @param linuxWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Linux workers.
+     * @param xenonWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Xenon workers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;GeoRegionInner&gt; object
      */
-    public Observable<ServiceResponse<Page<GeoRegionInner>>> listGeoRegionsWithServiceResponseAsync(final SkuName sku, final Boolean linuxWorkersEnabled) {
-        return listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled)
+    public Observable<ServiceResponse<Page<GeoRegionInner>>> listGeoRegionsWithServiceResponseAsync(final SkuName sku, final Boolean linuxWorkersEnabled, final Boolean xenonWorkersEnabled) {
+        return listGeoRegionsSinglePageAsync(sku, linuxWorkersEnabled, xenonWorkersEnabled)
             .concatMap(new Func1<ServiceResponse<Page<GeoRegionInner>>, Observable<ServiceResponse<Page<GeoRegionInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<GeoRegionInner>>> call(ServiceResponse<Page<GeoRegionInner>> page) {
@@ -1606,17 +1631,18 @@ public Observable<ServiceResponse<Page<GeoRegionInner>>> call(ServiceResponse<Pa
      *
     ServiceResponse<PageImpl<GeoRegionInner>> * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic', 'Isolated', 'PremiumV2'
     ServiceResponse<PageImpl<GeoRegionInner>> * @param linuxWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Linux workers.
+    ServiceResponse<PageImpl<GeoRegionInner>> * @param xenonWorkersEnabled Specify &lt;code&gt;true&lt;/code&gt; if you want to filter to only regions that support Xenon workers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;GeoRegionInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<Page<GeoRegionInner>>> listGeoRegionsSinglePageAsync(final SkuName sku, final Boolean linuxWorkersEnabled) {
+    public Observable<ServiceResponse<Page<GeoRegionInner>>> listGeoRegionsSinglePageAsync(final SkuName sku, final Boolean linuxWorkersEnabled, final Boolean xenonWorkersEnabled) {
         if (this.subscriptionId() == null) {
             throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null.");
         }
         if (this.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.apiVersion() is required and cannot be null.");
         }
-        return service.listGeoRegions(this.subscriptionId(), sku, linuxWorkersEnabled, this.apiVersion(), this.acceptLanguage(), this.userAgent())
+        return service.listGeoRegions(this.subscriptionId(), sku, linuxWorkersEnabled, xenonWorkersEnabled, this.apiVersion(), this.acceptLanguage(), this.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<GeoRegionInner>>>>() {
                 @Override
                 public Observable<ServiceResponse<Page<GeoRegionInner>>> call(Response<ResponseBody> response) {
diff --git a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WorkerPoolsImpl.java b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WorkerPoolsImpl.java
index 042f321a0dbb..03a5ab928630 100644
--- a/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WorkerPoolsImpl.java
+++ b/appservice/resource-manager/v2018_02_01/src/main/java/com/microsoft/azure/management/appservice/v2018_02_01/implementation/WorkerPoolsImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2018_02_01.SkuDescription;
 
 class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolResourceInner, WorkerPoolsImpl> implements WorkerPools, WorkerPools.Definition, WorkerPools.Update {
-    private final AppServiceManager manager;
+    private final CertificateRegistrationManager manager;
     private String resourceGroupName;
     private String name;
     private String workerPoolName;
 
-    WorkerPoolsImpl(String name, AppServiceManager manager) {
+    WorkerPoolsImpl(String name, CertificateRegistrationManager manager) {
         super(name, new WorkerPoolResourceInner());
         this.manager = manager;
         // Set resource name
@@ -29,7 +29,7 @@ class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolReso
         //
     }
 
-    WorkerPoolsImpl(WorkerPoolResourceInner inner, AppServiceManager manager) {
+    WorkerPoolsImpl(WorkerPoolResourceInner inner, CertificateRegistrationManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -42,7 +42,7 @@ class WorkerPoolsImpl extends CreatableUpdatableImpl<WorkerPools, WorkerPoolReso
     }
 
     @Override
-    public AppServiceManager manager() {
+    public CertificateRegistrationManager manager() {
         return this.manager;
     }
 
diff --git a/authorization/resource-manager/v2015_07_01/pom.xml b/authorization/resource-manager/v2015_07_01/pom.xml
index 76d72a8b1c95..734c31f46641 100644
--- a/authorization/resource-manager/v2015_07_01/pom.xml
+++ b/authorization/resource-manager/v2015_07_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.authorization.v2015_07_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-authorization</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Authorization Management</name>
-    <description>This package contains Microsoft Authorization Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.authorization.v2015_07_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-authorization</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Authorization Management</name>
+    <description>This package contains Microsoft Authorization Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ClassicAdministratorProperties.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ClassicAdministratorProperties.java
index e3eb75781ece..bff2c9f529d6 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ClassicAdministratorProperties.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ClassicAdministratorProperties.java
@@ -27,7 +27,7 @@ public class ClassicAdministratorProperties {
     private String role;
 
     /**
-     * Get the emailAddress value.
+     * Get the email address of the administrator.
      *
      * @return the emailAddress value
      */
@@ -36,7 +36,7 @@ public String emailAddress() {
     }
 
     /**
-     * Set the emailAddress value.
+     * Set the email address of the administrator.
      *
      * @param emailAddress the emailAddress value to set
      * @return the ClassicAdministratorProperties object itself.
@@ -47,7 +47,7 @@ public ClassicAdministratorProperties withEmailAddress(String emailAddress) {
     }
 
     /**
-     * Get the role value.
+     * Get the role of the administrator.
      *
      * @return the role value
      */
@@ -56,7 +56,7 @@ public String role() {
     }
 
     /**
-     * Set the role value.
+     * Set the role of the administrator.
      *
      * @param role the role value to set
      * @return the ClassicAdministratorProperties object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ProviderOperation.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ProviderOperation.java
index 516e35ad30eb..2dcf21d9d89a 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ProviderOperation.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ProviderOperation.java
@@ -45,7 +45,7 @@ public class ProviderOperation {
     private Object properties;
 
     /**
-     * Get the name value.
+     * Get the operation name.
      *
      * @return the name value
      */
@@ -54,7 +54,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the operation name.
      *
      * @param name the name value to set
      * @return the ProviderOperation object itself.
@@ -65,7 +65,7 @@ public ProviderOperation withName(String name) {
     }
 
     /**
-     * Get the displayName value.
+     * Get the operation display name.
      *
      * @return the displayName value
      */
@@ -74,7 +74,7 @@ public String displayName() {
     }
 
     /**
-     * Set the displayName value.
+     * Set the operation display name.
      *
      * @param displayName the displayName value to set
      * @return the ProviderOperation object itself.
@@ -85,7 +85,7 @@ public ProviderOperation withDisplayName(String displayName) {
     }
 
     /**
-     * Get the description value.
+     * Get the operation description.
      *
      * @return the description value
      */
@@ -94,7 +94,7 @@ public String description() {
     }
 
     /**
-     * Set the description value.
+     * Set the operation description.
      *
      * @param description the description value to set
      * @return the ProviderOperation object itself.
@@ -105,7 +105,7 @@ public ProviderOperation withDescription(String description) {
     }
 
     /**
-     * Get the origin value.
+     * Get the operation origin.
      *
      * @return the origin value
      */
@@ -114,7 +114,7 @@ public String origin() {
     }
 
     /**
-     * Set the origin value.
+     * Set the operation origin.
      *
      * @param origin the origin value to set
      * @return the ProviderOperation object itself.
@@ -125,7 +125,7 @@ public ProviderOperation withOrigin(String origin) {
     }
 
     /**
-     * Get the properties value.
+     * Get the operation properties.
      *
      * @return the properties value
      */
@@ -134,7 +134,7 @@ public Object properties() {
     }
 
     /**
-     * Set the properties value.
+     * Set the operation properties.
      *
      * @param properties the properties value to set
      * @return the ProviderOperation object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ResourceType.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ResourceType.java
index 43058913c697..53a0bfa0a169 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ResourceType.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/ResourceType.java
@@ -34,7 +34,7 @@ public class ResourceType {
     private List<ProviderOperation> operations;
 
     /**
-     * Get the name value.
+     * Get the resource type name.
      *
      * @return the name value
      */
@@ -43,7 +43,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the resource type name.
      *
      * @param name the name value to set
      * @return the ResourceType object itself.
@@ -54,7 +54,7 @@ public ResourceType withName(String name) {
     }
 
     /**
-     * Get the displayName value.
+     * Get the resource type display name.
      *
      * @return the displayName value
      */
@@ -63,7 +63,7 @@ public String displayName() {
     }
 
     /**
-     * Set the displayName value.
+     * Set the resource type display name.
      *
      * @param displayName the displayName value to set
      * @return the ResourceType object itself.
@@ -74,7 +74,7 @@ public ResourceType withDisplayName(String displayName) {
     }
 
     /**
-     * Get the operations value.
+     * Get the resource type operations.
      *
      * @return the operations value
      */
@@ -83,7 +83,7 @@ public List<ProviderOperation> operations() {
     }
 
     /**
-     * Set the operations value.
+     * Set the resource type operations.
      *
      * @param operations the operations value to set
      * @return the ResourceType object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignment.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignment.java
index 54b1220aa774..9372dc043913 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignment.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignment.java
@@ -44,7 +44,7 @@ public interface RoleAssignment extends HasInner<RoleAssignmentInner>, Indexable
     /**
      * The entirety of the RoleAssignment definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithProvider, DefinitionStages.WithScope, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithProvider, DefinitionStages.WithScope, DefinitionStages.WithProperties, DefinitionStages.WithCreate {
     }
 
     /**
@@ -74,7 +74,17 @@ interface WithScope {
            /**
             * Specifies scope.
             */
-            WithCreate withScope(String scope);
+            WithProperties withScope(String scope);
+        }
+
+        /**
+         * The stage of the roleassignment definition allowing to specify Properties.
+         */
+        interface WithProperties {
+           /**
+            * Specifies properties.
+            */
+            WithCreate withProperties(RoleAssignmentProperties properties);
         }
 
         /**
@@ -88,12 +98,22 @@ interface WithCreate extends Creatable<RoleAssignment> {
     /**
      * The template for a RoleAssignment update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<RoleAssignment> {
+    interface Update extends Appliable<RoleAssignment>, UpdateStages.WithProperties {
     }
 
     /**
      * Grouping of RoleAssignment update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the roleassignment update allowing to specify Properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies properties.
+             */
+            Update withProperties(RoleAssignmentProperties properties);
+        }
+
     }
 }
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentCreateParameters.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentCreateParameters.java
index 8b441f76a52f..94292f6ee6a8 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentCreateParameters.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentCreateParameters.java
@@ -17,11 +17,11 @@ public class RoleAssignmentCreateParameters {
     /**
      * Role assignment properties.
      */
-    @JsonProperty(value = "properties")
+    @JsonProperty(value = "properties", required = true)
     private RoleAssignmentProperties properties;
 
     /**
-     * Get the properties value.
+     * Get role assignment properties.
      *
      * @return the properties value
      */
@@ -30,7 +30,7 @@ public RoleAssignmentProperties properties() {
     }
 
     /**
-     * Set the properties value.
+     * Set role assignment properties.
      *
      * @param properties the properties value to set
      * @return the RoleAssignmentCreateParameters object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentFilter.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentFilter.java
index 84b49ad13e85..e8ea9b579c18 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentFilter.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentFilter.java
@@ -21,7 +21,7 @@ public class RoleAssignmentFilter {
     private String principalId;
 
     /**
-     * Get the principalId value.
+     * Get returns role assignment of the specific principal.
      *
      * @return the principalId value
      */
@@ -30,7 +30,7 @@ public String principalId() {
     }
 
     /**
-     * Set the principalId value.
+     * Set returns role assignment of the specific principal.
      *
      * @param principalId the principalId value to set
      * @return the RoleAssignmentFilter object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentProperties.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentProperties.java
index 914f72e42356..da7d7c7c8b19 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentProperties.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentProperties.java
@@ -17,7 +17,7 @@ public class RoleAssignmentProperties {
     /**
      * The role definition ID used in the role assignment.
      */
-    @JsonProperty(value = "roleDefinitionId")
+    @JsonProperty(value = "roleDefinitionId", required = true)
     private String roleDefinitionId;
 
     /**
@@ -25,11 +25,11 @@ public class RoleAssignmentProperties {
      * Active Directory. It can point to a user, service principal, or security
      * group.
      */
-    @JsonProperty(value = "principalId")
+    @JsonProperty(value = "principalId", required = true)
     private String principalId;
 
     /**
-     * Get the roleDefinitionId value.
+     * Get the role definition ID used in the role assignment.
      *
      * @return the roleDefinitionId value
      */
@@ -38,7 +38,7 @@ public String roleDefinitionId() {
     }
 
     /**
-     * Set the roleDefinitionId value.
+     * Set the role definition ID used in the role assignment.
      *
      * @param roleDefinitionId the roleDefinitionId value to set
      * @return the RoleAssignmentProperties object itself.
@@ -49,7 +49,7 @@ public RoleAssignmentProperties withRoleDefinitionId(String roleDefinitionId) {
     }
 
     /**
-     * Get the principalId value.
+     * Get the principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group.
      *
      * @return the principalId value
      */
@@ -58,7 +58,7 @@ public String principalId() {
     }
 
     /**
-     * Set the principalId value.
+     * Set the principal ID assigned to the role. This maps to the ID inside the Active Directory. It can point to a user, service principal, or security group.
      *
      * @param principalId the principalId value to set
      * @return the RoleAssignmentProperties object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentPropertiesWithScope.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentPropertiesWithScope.java
index b8ae30c87e00..451a9ed2d3f7 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentPropertiesWithScope.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignmentPropertiesWithScope.java
@@ -33,7 +33,7 @@ public class RoleAssignmentPropertiesWithScope {
     private String principalId;
 
     /**
-     * Get the scope value.
+     * Get the role assignment scope.
      *
      * @return the scope value
      */
@@ -42,7 +42,7 @@ public String scope() {
     }
 
     /**
-     * Set the scope value.
+     * Set the role assignment scope.
      *
      * @param scope the scope value to set
      * @return the RoleAssignmentPropertiesWithScope object itself.
@@ -53,7 +53,7 @@ public RoleAssignmentPropertiesWithScope withScope(String scope) {
     }
 
     /**
-     * Get the roleDefinitionId value.
+     * Get the role definition ID.
      *
      * @return the roleDefinitionId value
      */
@@ -62,7 +62,7 @@ public String roleDefinitionId() {
     }
 
     /**
-     * Set the roleDefinitionId value.
+     * Set the role definition ID.
      *
      * @param roleDefinitionId the roleDefinitionId value to set
      * @return the RoleAssignmentPropertiesWithScope object itself.
@@ -73,7 +73,7 @@ public RoleAssignmentPropertiesWithScope withRoleDefinitionId(String roleDefinit
     }
 
     /**
-     * Get the principalId value.
+     * Get the principal ID.
      *
      * @return the principalId value
      */
@@ -82,7 +82,7 @@ public String principalId() {
     }
 
     /**
-     * Set the principalId value.
+     * Set the principal ID.
      *
      * @param principalId the principalId value to set
      * @return the RoleAssignmentPropertiesWithScope object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignments.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignments.java
index 5cfd88b2899e..33509fae2d68 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignments.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleAssignments.java
@@ -39,7 +39,7 @@ public interface RoleAssignments extends SupportsCreating<RoleAssignment.Definit
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable deleteAsync(String scope, String roleAssignmentName);
+    Observable<RoleAssignment> deleteAsync(String scope, String roleAssignmentName);
 
     /**
      * Get the specified role assignment.
@@ -58,16 +58,17 @@ public interface RoleAssignments extends SupportsCreating<RoleAssignment.Definit
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable deleteByIdAsync(String roleAssignmentId);
+    Observable<RoleAssignment> deleteByIdAsync(String roleAssignmentId);
 
     /**
      * Creates a role assignment by ID.
      *
      * @param roleAssignmentId The fully qualified ID of the role assignment, including the scope, resource name and resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}.
+     * @param properties Role assignment properties.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<RoleAssignment> createByIdAsync(String roleAssignmentId);
+    Observable<RoleAssignment> createByIdAsync(String roleAssignmentId, RoleAssignmentProperties properties);
 
     /**
      * Gets a role assignment by ID.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionFilter.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionFilter.java
index 41c7b5672f68..05ecf284bb63 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionFilter.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionFilter.java
@@ -21,7 +21,7 @@ public class RoleDefinitionFilter {
     private String roleName;
 
     /**
-     * Get the roleName value.
+     * Get returns role definition with the specific name.
      *
      * @return the roleName value
      */
@@ -30,7 +30,7 @@ public String roleName() {
     }
 
     /**
-     * Set the roleName value.
+     * Set returns role definition with the specific name.
      *
      * @param roleName the roleName value to set
      * @return the RoleDefinitionFilter object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionProperties.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionProperties.java
index 6b27aa0a5683..9035cdf86e74 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionProperties.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitionProperties.java
@@ -47,7 +47,7 @@ public class RoleDefinitionProperties {
     private List<String> assignableScopes;
 
     /**
-     * Get the roleName value.
+     * Get the role name.
      *
      * @return the roleName value
      */
@@ -56,7 +56,7 @@ public String roleName() {
     }
 
     /**
-     * Set the roleName value.
+     * Set the role name.
      *
      * @param roleName the roleName value to set
      * @return the RoleDefinitionProperties object itself.
@@ -67,7 +67,7 @@ public RoleDefinitionProperties withRoleName(String roleName) {
     }
 
     /**
-     * Get the description value.
+     * Get the role definition description.
      *
      * @return the description value
      */
@@ -76,7 +76,7 @@ public String description() {
     }
 
     /**
-     * Set the description value.
+     * Set the role definition description.
      *
      * @param description the description value to set
      * @return the RoleDefinitionProperties object itself.
@@ -87,7 +87,7 @@ public RoleDefinitionProperties withDescription(String description) {
     }
 
     /**
-     * Get the type value.
+     * Get the role type.
      *
      * @return the type value
      */
@@ -96,7 +96,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the role type.
      *
      * @param type the type value to set
      * @return the RoleDefinitionProperties object itself.
@@ -107,7 +107,7 @@ public RoleDefinitionProperties withType(String type) {
     }
 
     /**
-     * Get the permissions value.
+     * Get role definition permissions.
      *
      * @return the permissions value
      */
@@ -116,7 +116,7 @@ public List<PermissionInner> permissions() {
     }
 
     /**
-     * Set the permissions value.
+     * Set role definition permissions.
      *
      * @param permissions the permissions value to set
      * @return the RoleDefinitionProperties object itself.
@@ -127,7 +127,7 @@ public RoleDefinitionProperties withPermissions(List<PermissionInner> permission
     }
 
     /**
-     * Get the assignableScopes value.
+     * Get role definition assignable scopes.
      *
      * @return the assignableScopes value
      */
@@ -136,7 +136,7 @@ public List<String> assignableScopes() {
     }
 
     /**
-     * Set the assignableScopes value.
+     * Set role definition assignable scopes.
      *
      * @param assignableScopes the assignableScopes value to set
      * @return the RoleDefinitionProperties object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitions.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitions.java
index 166743c2b597..dea84accf81a 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitions.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/RoleDefinitions.java
@@ -26,7 +26,7 @@ public interface RoleDefinitions extends SupportsCreating<RoleDefinition.Definit
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Completable deleteAsync(String scope, String roleDefinitionId);
+    Observable<RoleDefinition> deleteAsync(String scope, String roleDefinitionId);
 
     /**
      * Get role definition by name (GUID).
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManagementClientImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManagementClientImpl.java
index 242aee21eeb9..2e25bbbb11b2 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManagementClientImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManagementClientImpl.java
@@ -51,11 +51,11 @@ public AuthorizationManagementClientImpl withSubscriptionId(String subscriptionI
         return this;
     }
 
-    /** The API version to use for the operation. */
+    /** The API version to use for this operation. */
     private String apiVersion;
 
     /**
-     * Gets The API version to use for the operation.
+     * Gets The API version to use for this operation.
      *
      * @return the apiVersion value.
      */
@@ -132,19 +132,6 @@ public AuthorizationManagementClientImpl withGenerateClientRequestId(boolean gen
         return this;
     }
 
-    /**
-     * The ClassicAdministratorsInner object to access its operations.
-     */
-    private ClassicAdministratorsInner classicAdministrators;
-
-    /**
-     * Gets the ClassicAdministratorsInner object to access its operations.
-     * @return the ClassicAdministratorsInner object.
-     */
-    public ClassicAdministratorsInner classicAdministrators() {
-        return this.classicAdministrators;
-    }
-
     /**
      * The PermissionsInner object to access its operations.
      */
@@ -197,6 +184,19 @@ public RoleDefinitionsInner roleDefinitions() {
         return this.roleDefinitions;
     }
 
+    /**
+     * The ClassicAdministratorsInner object to access its operations.
+     */
+    private ClassicAdministratorsInner classicAdministrators;
+
+    /**
+     * Gets the ClassicAdministratorsInner object to access its operations.
+     * @return the ClassicAdministratorsInner object.
+     */
+    public ClassicAdministratorsInner classicAdministrators() {
+        return this.classicAdministrators;
+    }
+
     /**
      * Initializes an instance of AuthorizationManagementClient client.
      *
@@ -232,11 +232,11 @@ protected void initialize() {
         this.acceptLanguage = "en-US";
         this.longRunningOperationRetryTimeout = 30;
         this.generateClientRequestId = true;
-        this.classicAdministrators = new ClassicAdministratorsInner(restClient().retrofit(), this);
         this.permissions = new PermissionsInner(restClient().retrofit(), this);
         this.providerOperationsMetadatas = new ProviderOperationsMetadatasInner(restClient().retrofit(), this);
         this.roleAssignments = new RoleAssignmentsInner(restClient().retrofit(), this);
         this.roleDefinitions = new RoleDefinitionsInner(restClient().retrofit(), this);
+        this.classicAdministrators = new ClassicAdministratorsInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManager.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManager.java
index 7db8bddf7dfd..2f96613e2d2d 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManager.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/AuthorizationManager.java
@@ -16,11 +16,11 @@
 import com.microsoft.azure.arm.resources.AzureConfigurable;
 import com.microsoft.azure.serializer.AzureJacksonAdapter;
 import com.microsoft.rest.RestClient;
-import com.microsoft.azure.management.authorization.v2015_07_01.ClassicAdministrators;
 import com.microsoft.azure.management.authorization.v2015_07_01.Permissions;
 import com.microsoft.azure.management.authorization.v2015_07_01.ProviderOperationsMetadatas;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignments;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleDefinitions;
+import com.microsoft.azure.management.authorization.v2015_07_01.ClassicAdministrators;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -28,11 +28,11 @@
  * Entry point to Azure Authorization resource management.
  */
 public final class AuthorizationManager extends ManagerCore<AuthorizationManager, AuthorizationManagementClientImpl> {
-    private ClassicAdministrators classicAdministrators;
     private Permissions permissions;
     private ProviderOperationsMetadatas providerOperationsMetadatas;
     private RoleAssignments roleAssignments;
     private RoleDefinitions roleDefinitions;
+    private ClassicAdministrators classicAdministrators;
     /**
     * Get a Configurable instance that can be used to create AuthorizationManager with optional configuration.
     *
@@ -80,16 +80,6 @@ public interface Configurable extends AzureConfigurable<Configurable> {
         AuthorizationManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
     }
 
-    /**
-     * @return Entry point to manage ClassicAdministrators.
-     */
-    public ClassicAdministrators classicAdministrators() {
-        if (this.classicAdministrators == null) {
-            this.classicAdministrators = new ClassicAdministratorsImpl(this);
-        }
-        return this.classicAdministrators;
-    }
-
     /**
      * @return Entry point to manage Permissions.
      */
@@ -130,6 +120,16 @@ public RoleDefinitions roleDefinitions() {
         return this.roleDefinitions;
     }
 
+    /**
+     * @return Entry point to manage ClassicAdministrators.
+     */
+    public ClassicAdministrators classicAdministrators() {
+        if (this.classicAdministrators == null) {
+            this.classicAdministrators = new ClassicAdministratorsImpl(this);
+        }
+        return this.classicAdministrators;
+    }
+
     /**
     * The implementation for Configurable interface.
     */
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorInner.java
index 960ce37b97c2..7f18e6610235 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorInner.java
@@ -40,7 +40,7 @@ public class ClassicAdministratorInner {
     private ClassicAdministratorProperties properties;
 
     /**
-     * Get the id value.
+     * Get the ID of the administrator.
      *
      * @return the id value
      */
@@ -49,7 +49,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the ID of the administrator.
      *
      * @param id the id value to set
      * @return the ClassicAdministratorInner object itself.
@@ -60,7 +60,7 @@ public ClassicAdministratorInner withId(String id) {
     }
 
     /**
-     * Get the name value.
+     * Get the name of the administrator.
      *
      * @return the name value
      */
@@ -69,7 +69,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the administrator.
      *
      * @param name the name value to set
      * @return the ClassicAdministratorInner object itself.
@@ -80,7 +80,7 @@ public ClassicAdministratorInner withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get the type of the administrator.
      *
      * @return the type value
      */
@@ -89,7 +89,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of the administrator.
      *
      * @param type the type value to set
      * @return the ClassicAdministratorInner object itself.
@@ -100,7 +100,7 @@ public ClassicAdministratorInner withType(String type) {
     }
 
     /**
-     * Get the properties value.
+     * Get properties for the classic administrator.
      *
      * @return the properties value
      */
@@ -109,7 +109,7 @@ public ClassicAdministratorProperties properties() {
     }
 
     /**
-     * Set the properties value.
+     * Set properties for the classic administrator.
      *
      * @param properties the properties value to set
      * @return the ClassicAdministratorInner object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorsImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorsImpl.java
index a5b62e090fea..1875e44be030 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorsImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ClassicAdministratorsImpl.java
@@ -37,7 +37,8 @@ public Observable<ClassicAdministrator> listAsync(final String apiVersion) {
             public Iterable<ClassicAdministratorInner> call(Page<ClassicAdministratorInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<ClassicAdministratorInner, ClassicAdministrator>() {
+        })
+        .map(new Func1<ClassicAdministratorInner, ClassicAdministrator>() {
             @Override
             public ClassicAdministrator call(ClassicAdministratorInner inner) {
                 return new ClassicAdministratorImpl(inner, manager());
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionInner.java
index e926a8876118..70d897f38dc6 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionInner.java
@@ -28,7 +28,7 @@ public class PermissionInner {
     private List<String> notActions;
 
     /**
-     * Get the actions value.
+     * Get allowed actions.
      *
      * @return the actions value
      */
@@ -37,7 +37,7 @@ public List<String> actions() {
     }
 
     /**
-     * Set the actions value.
+     * Set allowed actions.
      *
      * @param actions the actions value to set
      * @return the PermissionInner object itself.
@@ -48,7 +48,7 @@ public PermissionInner withActions(List<String> actions) {
     }
 
     /**
-     * Get the notActions value.
+     * Get denied actions.
      *
      * @return the notActions value
      */
@@ -57,7 +57,7 @@ public List<String> notActions() {
     }
 
     /**
-     * Set the notActions value.
+     * Set denied actions.
      *
      * @param notActions the notActions value to set
      * @return the PermissionInner object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionsImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionsImpl.java
index af0f288fac5c..99ca623ba097 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionsImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/PermissionsImpl.java
@@ -37,7 +37,8 @@ public Observable<Permission> listForResourceAsync(final String resourceGroupNam
             public Iterable<PermissionInner> call(Page<PermissionInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<PermissionInner, Permission>() {
+        })
+        .map(new Func1<PermissionInner, Permission>() {
             @Override
             public Permission call(PermissionInner inner) {
                 return new PermissionImpl(inner, manager());
@@ -54,7 +55,8 @@ public Observable<Permission> listByResourceGroupAsync(final String resourceGrou
             public Iterable<PermissionInner> call(Page<PermissionInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<PermissionInner, Permission>() {
+        })
+        .map(new Func1<PermissionInner, Permission>() {
             @Override
             public Permission call(PermissionInner inner) {
                 return new PermissionImpl(inner, manager());
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadataInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadataInner.java
index 30e3110e6115..bcf0a7c91218 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadataInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadataInner.java
@@ -54,7 +54,7 @@ public class ProviderOperationsMetadataInner {
     private List<ProviderOperation> operations;
 
     /**
-     * Get the id value.
+     * Get the provider id.
      *
      * @return the id value
      */
@@ -63,7 +63,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the provider id.
      *
      * @param id the id value to set
      * @return the ProviderOperationsMetadataInner object itself.
@@ -74,7 +74,7 @@ public ProviderOperationsMetadataInner withId(String id) {
     }
 
     /**
-     * Get the name value.
+     * Get the provider name.
      *
      * @return the name value
      */
@@ -83,7 +83,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the provider name.
      *
      * @param name the name value to set
      * @return the ProviderOperationsMetadataInner object itself.
@@ -94,7 +94,7 @@ public ProviderOperationsMetadataInner withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get the provider type.
      *
      * @return the type value
      */
@@ -103,7 +103,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the provider type.
      *
      * @param type the type value to set
      * @return the ProviderOperationsMetadataInner object itself.
@@ -114,7 +114,7 @@ public ProviderOperationsMetadataInner withType(String type) {
     }
 
     /**
-     * Get the displayName value.
+     * Get the provider display name.
      *
      * @return the displayName value
      */
@@ -123,7 +123,7 @@ public String displayName() {
     }
 
     /**
-     * Set the displayName value.
+     * Set the provider display name.
      *
      * @param displayName the displayName value to set
      * @return the ProviderOperationsMetadataInner object itself.
@@ -134,7 +134,7 @@ public ProviderOperationsMetadataInner withDisplayName(String displayName) {
     }
 
     /**
-     * Get the resourceTypes value.
+     * Get the provider resource types.
      *
      * @return the resourceTypes value
      */
@@ -143,7 +143,7 @@ public List<ResourceType> resourceTypes() {
     }
 
     /**
-     * Set the resourceTypes value.
+     * Set the provider resource types.
      *
      * @param resourceTypes the resourceTypes value to set
      * @return the ProviderOperationsMetadataInner object itself.
@@ -154,7 +154,7 @@ public ProviderOperationsMetadataInner withResourceTypes(List<ResourceType> reso
     }
 
     /**
-     * Get the operations value.
+     * Get the provider operations.
      *
      * @return the operations value
      */
@@ -163,7 +163,7 @@ public List<ProviderOperation> operations() {
     }
 
     /**
-     * Set the operations value.
+     * Set the provider operations.
      *
      * @param operations the operations value to set
      * @return the ProviderOperationsMetadataInner object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadatasImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadatasImpl.java
index 9ef4374e9326..6a5123cf61e0 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadatasImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/ProviderOperationsMetadatasImpl.java
@@ -49,7 +49,8 @@ public Observable<ProviderOperationsMetadata> listAsync(final String apiVersion)
             public Iterable<ProviderOperationsMetadataInner> call(Page<ProviderOperationsMetadataInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<ProviderOperationsMetadataInner, ProviderOperationsMetadata>() {
+        })
+        .map(new Func1<ProviderOperationsMetadataInner, ProviderOperationsMetadata>() {
             @Override
             public ProviderOperationsMetadata call(ProviderOperationsMetadataInner inner) {
                 return new ProviderOperationsMetadataImpl(inner, manager());
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentImpl.java
index 5054ca743196..ec8463c90359 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentImpl.java
@@ -11,12 +11,16 @@
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignment;
 import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
+import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignmentProperties;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignmentPropertiesWithScope;
+import rx.functions.Func1;
 
 class RoleAssignmentImpl extends CreatableUpdatableImpl<RoleAssignment, RoleAssignmentInner, RoleAssignmentImpl> implements RoleAssignment, RoleAssignment.Definition, RoleAssignment.Update {
     private final AuthorizationManager manager;
     private String scope;
     private String roleAssignmentName;
+    private RoleAssignmentProperties cproperties;
+    private RoleAssignmentProperties uproperties;
 
     RoleAssignmentImpl(String name, AuthorizationManager manager) {
         super(name, new RoleAssignmentInner());
@@ -24,6 +28,8 @@ class RoleAssignmentImpl extends CreatableUpdatableImpl<RoleAssignment, RoleAssi
         // Set resource name
         this.roleAssignmentName = name;
         //
+        this.cproperties = new RoleAssignmentProperties();
+        this.uproperties = new RoleAssignmentProperties();
     }
 
     RoleAssignmentImpl(RoleAssignmentInner inner, AuthorizationManager manager) {
@@ -35,6 +41,8 @@ class RoleAssignmentImpl extends CreatableUpdatableImpl<RoleAssignment, RoleAssi
         this.roleAssignmentName = IdParsingUtils.getValueFromIdByName(inner.id(), "roleAssignments");
         this.scope = IdParsingUtils.getValueFromIdByPosition(inner.id(), 0);
         //
+        this.cproperties = new RoleAssignmentProperties();
+        this.uproperties = new RoleAssignmentProperties();
     }
 
     @Override
@@ -45,14 +53,28 @@ public AuthorizationManager manager() {
     @Override
     public Observable<RoleAssignment> createResourceAsync() {
         RoleAssignmentsInner client = this.manager().inner().roleAssignments();
-        return client.createAsync(this.scope, this.roleAssignmentName)
+        return client.createAsync(this.scope, this.roleAssignmentName, this.cproperties)
+            .map(new Func1<RoleAssignmentInner, RoleAssignmentInner>() {
+               @Override
+               public RoleAssignmentInner call(RoleAssignmentInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
             .map(innerToFluentMap(this));
     }
 
     @Override
     public Observable<RoleAssignment> updateResourceAsync() {
         RoleAssignmentsInner client = this.manager().inner().roleAssignments();
-        return client.createAsync(this.scope, this.roleAssignmentName)
+        return client.createAsync(this.scope, this.roleAssignmentName, this.uproperties)
+            .map(new Func1<RoleAssignmentInner, RoleAssignmentInner>() {
+               @Override
+               public RoleAssignmentInner call(RoleAssignmentInner resource) {
+                   resetCreateUpdateParameters();
+                   return resource;
+               }
+            })
             .map(innerToFluentMap(this));
     }
 
@@ -67,6 +89,10 @@ public boolean isInCreateMode() {
         return this.inner().id() == null;
     }
 
+    private void resetCreateUpdateParameters() {
+        this.cproperties = new RoleAssignmentProperties();
+        this.uproperties = new RoleAssignmentProperties();
+    }
 
     @Override
     public String id() {
@@ -99,4 +125,14 @@ public RoleAssignmentImpl withScope(String scope) {
         return this;
     }
 
+    @Override
+    public RoleAssignmentImpl withProperties(RoleAssignmentProperties properties) {
+        if (isInCreateMode()) {
+            this.cproperties = properties;
+        } else {
+            this.uproperties = properties;
+        }
+        return this;
+    }
+
 }
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentInner.java
index 0785899f77b8..d712b7c21511 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentInner.java
@@ -40,7 +40,7 @@ public class RoleAssignmentInner {
     private RoleAssignmentPropertiesWithScope properties;
 
     /**
-     * Get the id value.
+     * Get the role assignment ID.
      *
      * @return the id value
      */
@@ -49,7 +49,7 @@ public String id() {
     }
 
     /**
-     * Get the name value.
+     * Get the role assignment name.
      *
      * @return the name value
      */
@@ -58,7 +58,7 @@ public String name() {
     }
 
     /**
-     * Get the type value.
+     * Get the role assignment type.
      *
      * @return the type value
      */
@@ -67,7 +67,7 @@ public String type() {
     }
 
     /**
-     * Get the properties value.
+     * Get role assignment properties.
      *
      * @return the properties value
      */
@@ -76,7 +76,7 @@ public RoleAssignmentPropertiesWithScope properties() {
     }
 
     /**
-     * Set the properties value.
+     * Set role assignment properties.
      *
      * @param properties the properties value to set
      * @return the RoleAssignmentInner object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsImpl.java
index 5594ab890264..3542de7f8bb2 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsImpl.java
@@ -11,11 +11,11 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignments;
-import rx.Completable;
 import rx.functions.Func1;
 import rx.Observable;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignment;
+import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignmentProperties;
 
 class RoleAssignmentsImpl extends WrapperImpl<RoleAssignmentsInner> implements RoleAssignments {
     private final AuthorizationManager manager;
@@ -51,7 +51,8 @@ public Observable<RoleAssignment> listForResourceAsync(final String resourceGrou
             public Iterable<RoleAssignmentInner> call(Page<RoleAssignmentInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+        })
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
             @Override
             public RoleAssignment call(RoleAssignmentInner inner) {
                 return new RoleAssignmentImpl(inner, manager());
@@ -60,9 +61,15 @@ public RoleAssignment call(RoleAssignmentInner inner) {
     }
 
     @Override
-    public Completable deleteAsync(String scope, String roleAssignmentName) {
+    public Observable<RoleAssignment> deleteAsync(String scope, String roleAssignmentName) {
         RoleAssignmentsInner client = this.inner();
-        return client.deleteAsync(scope, roleAssignmentName).toCompletable();
+        return client.deleteAsync(scope, roleAssignmentName)
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+            @Override
+            public RoleAssignment call(RoleAssignmentInner inner) {
+                return new RoleAssignmentImpl(inner, manager());
+            }
+        });
     }
 
     @Override
@@ -78,15 +85,21 @@ public RoleAssignment call(RoleAssignmentInner inner) {
     }
 
     @Override
-    public Completable deleteByIdAsync(String roleAssignmentId) {
+    public Observable<RoleAssignment> deleteByIdAsync(String roleAssignmentId) {
         RoleAssignmentsInner client = this.inner();
-        return client.deleteByIdAsync(roleAssignmentId).toCompletable();
+        return client.deleteByIdAsync(roleAssignmentId)
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+            @Override
+            public RoleAssignment call(RoleAssignmentInner inner) {
+                return new RoleAssignmentImpl(inner, manager());
+            }
+        });
     }
 
     @Override
-    public Observable<RoleAssignment> createByIdAsync(String roleAssignmentId) {
+    public Observable<RoleAssignment> createByIdAsync(String roleAssignmentId, RoleAssignmentProperties properties) {
         RoleAssignmentsInner client = this.inner();
-        return client.createByIdAsync(roleAssignmentId)
+        return client.createByIdAsync(roleAssignmentId, properties)
         .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
             @Override
             public RoleAssignment call(RoleAssignmentInner inner) {
@@ -116,7 +129,8 @@ public Observable<RoleAssignment> listByResourceGroupAsync(final String resource
             public Iterable<RoleAssignmentInner> call(Page<RoleAssignmentInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+        })
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
             @Override
             public RoleAssignment call(RoleAssignmentInner inner) {
                 return new RoleAssignmentImpl(inner, manager());
@@ -133,7 +147,8 @@ public Observable<RoleAssignment> listAsync() {
             public Iterable<RoleAssignmentInner> call(Page<RoleAssignmentInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+        })
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
             @Override
             public RoleAssignment call(RoleAssignmentInner inner) {
                 return new RoleAssignmentImpl(inner, manager());
@@ -150,7 +165,8 @@ public Observable<RoleAssignment> listForScopeAsync(final String scope) {
             public Iterable<RoleAssignmentInner> call(Page<RoleAssignmentInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
+        })
+        .map(new Func1<RoleAssignmentInner, RoleAssignment>() {
             @Override
             public RoleAssignment call(RoleAssignmentInner inner) {
                 return new RoleAssignmentImpl(inner, manager());
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsInner.java
index 5262b3a53cfc..67a00ca66d68 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleAssignmentsInner.java
@@ -728,85 +728,6 @@ private ServiceResponse<RoleAssignmentInner> deleteDelegate(Response<ResponseBod
                 .build(response);
     }
 
-    /**
-     * Creates a role assignment.
-     *
-     * @param scope The scope of the role assignment to create. The scope can be any REST resource instance. For example, use '/subscriptions/{subscription-id}/' for a subscription, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for a resource group, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider}/{resource-type}/{resource-name}' for a resource.
-     * @param roleAssignmentName The name of the role assignment to create. It can be any valid GUID.
-     * @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 RoleAssignmentInner object if successful.
-     */
-    public RoleAssignmentInner create(String scope, String roleAssignmentName) {
-        return createWithServiceResponseAsync(scope, roleAssignmentName).toBlocking().single().body();
-    }
-
-    /**
-     * Creates a role assignment.
-     *
-     * @param scope The scope of the role assignment to create. The scope can be any REST resource instance. For example, use '/subscriptions/{subscription-id}/' for a subscription, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for a resource group, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider}/{resource-type}/{resource-name}' for a resource.
-     * @param roleAssignmentName The name of the role assignment to create. It can be any valid GUID.
-     * @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<RoleAssignmentInner> createAsync(String scope, String roleAssignmentName, final ServiceCallback<RoleAssignmentInner> serviceCallback) {
-        return ServiceFuture.fromResponse(createWithServiceResponseAsync(scope, roleAssignmentName), serviceCallback);
-    }
-
-    /**
-     * Creates a role assignment.
-     *
-     * @param scope The scope of the role assignment to create. The scope can be any REST resource instance. For example, use '/subscriptions/{subscription-id}/' for a subscription, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for a resource group, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider}/{resource-type}/{resource-name}' for a resource.
-     * @param roleAssignmentName The name of the role assignment to create. It can be any valid GUID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RoleAssignmentInner object
-     */
-    public Observable<RoleAssignmentInner> createAsync(String scope, String roleAssignmentName) {
-        return createWithServiceResponseAsync(scope, roleAssignmentName).map(new Func1<ServiceResponse<RoleAssignmentInner>, RoleAssignmentInner>() {
-            @Override
-            public RoleAssignmentInner call(ServiceResponse<RoleAssignmentInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Creates a role assignment.
-     *
-     * @param scope The scope of the role assignment to create. The scope can be any REST resource instance. For example, use '/subscriptions/{subscription-id}/' for a subscription, '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}' for a resource group, and '/subscriptions/{subscription-id}/resourceGroups/{resource-group-name}/providers/{resource-provider}/{resource-type}/{resource-name}' for a resource.
-     * @param roleAssignmentName The name of the role assignment to create. It can be any valid GUID.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RoleAssignmentInner object
-     */
-    public Observable<ServiceResponse<RoleAssignmentInner>> createWithServiceResponseAsync(String scope, String roleAssignmentName) {
-        if (scope == null) {
-            throw new IllegalArgumentException("Parameter scope is required and cannot be null.");
-        }
-        if (roleAssignmentName == null) {
-            throw new IllegalArgumentException("Parameter roleAssignmentName is required and cannot be null.");
-        }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        final RoleAssignmentProperties properties = null;
-        RoleAssignmentCreateParameters parameters = new RoleAssignmentCreateParameters();
-        parameters.withProperties(null);
-        return service.create(scope, roleAssignmentName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RoleAssignmentInner>>>() {
-                @Override
-                public Observable<ServiceResponse<RoleAssignmentInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<RoleAssignmentInner> clientResponse = createDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
     /**
      * Creates a role assignment.
      *
@@ -873,6 +794,9 @@ public Observable<ServiceResponse<RoleAssignmentInner>> createWithServiceRespons
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
+        if (properties == null) {
+            throw new IllegalArgumentException("Parameter properties is required and cannot be null.");
+        }
         Validator.validate(properties);
         RoleAssignmentCreateParameters parameters = new RoleAssignmentCreateParameters();
         parameters.withProperties(properties);
@@ -1056,78 +980,6 @@ private ServiceResponse<RoleAssignmentInner> deleteByIdDelegate(Response<Respons
                 .build(response);
     }
 
-    /**
-     * Creates a role assignment by ID.
-     *
-     * @param roleAssignmentId The fully qualified ID of the role assignment, including the scope, resource name and resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}.
-     * @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 RoleAssignmentInner object if successful.
-     */
-    public RoleAssignmentInner createById(String roleAssignmentId) {
-        return createByIdWithServiceResponseAsync(roleAssignmentId).toBlocking().single().body();
-    }
-
-    /**
-     * Creates a role assignment by ID.
-     *
-     * @param roleAssignmentId The fully qualified ID of the role assignment, including the scope, resource name and resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}.
-     * @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<RoleAssignmentInner> createByIdAsync(String roleAssignmentId, final ServiceCallback<RoleAssignmentInner> serviceCallback) {
-        return ServiceFuture.fromResponse(createByIdWithServiceResponseAsync(roleAssignmentId), serviceCallback);
-    }
-
-    /**
-     * Creates a role assignment by ID.
-     *
-     * @param roleAssignmentId The fully qualified ID of the role assignment, including the scope, resource name and resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RoleAssignmentInner object
-     */
-    public Observable<RoleAssignmentInner> createByIdAsync(String roleAssignmentId) {
-        return createByIdWithServiceResponseAsync(roleAssignmentId).map(new Func1<ServiceResponse<RoleAssignmentInner>, RoleAssignmentInner>() {
-            @Override
-            public RoleAssignmentInner call(ServiceResponse<RoleAssignmentInner> response) {
-                return response.body();
-            }
-        });
-    }
-
-    /**
-     * Creates a role assignment by ID.
-     *
-     * @param roleAssignmentId The fully qualified ID of the role assignment, including the scope, resource name and resource type. Use the format, /{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}. Example: /subscriptions/{subId}/resourcegroups/{rgname}//providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the RoleAssignmentInner object
-     */
-    public Observable<ServiceResponse<RoleAssignmentInner>> createByIdWithServiceResponseAsync(String roleAssignmentId) {
-        if (roleAssignmentId == null) {
-            throw new IllegalArgumentException("Parameter roleAssignmentId is required and cannot be null.");
-        }
-        if (this.client.apiVersion() == null) {
-            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
-        }
-        final RoleAssignmentProperties properties = null;
-        RoleAssignmentCreateParameters parameters = new RoleAssignmentCreateParameters();
-        parameters.withProperties(null);
-        return service.createById(roleAssignmentId, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<RoleAssignmentInner>>>() {
-                @Override
-                public Observable<ServiceResponse<RoleAssignmentInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<RoleAssignmentInner> clientResponse = createByIdDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
-    }
-
     /**
      * Creates a role assignment by ID.
      *
@@ -1187,6 +1039,9 @@ public Observable<ServiceResponse<RoleAssignmentInner>> createByIdWithServiceRes
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
+        if (properties == null) {
+            throw new IllegalArgumentException("Parameter properties is required and cannot be null.");
+        }
         Validator.validate(properties);
         RoleAssignmentCreateParameters parameters = new RoleAssignmentCreateParameters();
         parameters.withProperties(properties);
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionInner.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionInner.java
index 9e9ebbd70bff..b9051b7e60a7 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionInner.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionInner.java
@@ -40,7 +40,7 @@ public class RoleDefinitionInner {
     private RoleDefinitionProperties properties;
 
     /**
-     * Get the id value.
+     * Get the role definition ID.
      *
      * @return the id value
      */
@@ -49,7 +49,7 @@ public String id() {
     }
 
     /**
-     * Get the name value.
+     * Get the role definition name.
      *
      * @return the name value
      */
@@ -58,7 +58,7 @@ public String name() {
     }
 
     /**
-     * Get the type value.
+     * Get the role definition type.
      *
      * @return the type value
      */
@@ -67,7 +67,7 @@ public String type() {
     }
 
     /**
-     * Get the properties value.
+     * Get role definition properties.
      *
      * @return the properties value
      */
@@ -76,7 +76,7 @@ public RoleDefinitionProperties properties() {
     }
 
     /**
-     * Set the properties value.
+     * Set role definition properties.
      *
      * @param properties the properties value to set
      * @return the RoleDefinitionInner object itself.
diff --git a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionsImpl.java b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionsImpl.java
index 3e209b725f8d..9f870bb615ab 100644
--- a/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionsImpl.java
+++ b/authorization/resource-manager/v2015_07_01/src/main/java/com/microsoft/azure/management/authorization/v2015_07_01/implementation/RoleDefinitionsImpl.java
@@ -11,7 +11,6 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.authorization.v2015_07_01.RoleDefinitions;
-import rx.Completable;
 import rx.functions.Func1;
 import rx.Observable;
 import com.microsoft.azure.Page;
@@ -43,9 +42,15 @@ private RoleDefinitionImpl wrapModel(String name) {
     }
 
     @Override
-    public Completable deleteAsync(String scope, String roleDefinitionId) {
+    public Observable<RoleDefinition> deleteAsync(String scope, String roleDefinitionId) {
         RoleDefinitionsInner client = this.inner();
-        return client.deleteAsync(scope, roleDefinitionId).toCompletable();
+        return client.deleteAsync(scope, roleDefinitionId)
+        .map(new Func1<RoleDefinitionInner, RoleDefinition>() {
+            @Override
+            public RoleDefinition call(RoleDefinitionInner inner) {
+                return new RoleDefinitionImpl(inner, manager());
+            }
+        });
     }
 
     @Override
@@ -81,7 +86,8 @@ public Observable<RoleDefinition> listAsync(final String scope) {
             public Iterable<RoleDefinitionInner> call(Page<RoleDefinitionInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RoleDefinitionInner, RoleDefinition>() {
+        })
+        .map(new Func1<RoleDefinitionInner, RoleDefinition>() {
             @Override
             public RoleDefinition call(RoleDefinitionInner inner) {
                 return new RoleDefinitionImpl(inner, manager());
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Catalogs.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Catalogs.java
new file mode 100644
index 000000000000..4ce05b768011
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Catalogs.java
@@ -0,0 +1,2937 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters;
+import com.microsoft.azure.datalake.analytics.models.USqlAssembly;
+import com.microsoft.azure.datalake.analytics.models.USqlAssemblyClr;
+import com.microsoft.azure.datalake.analytics.models.USqlCredential;
+import com.microsoft.azure.datalake.analytics.models.USqlDatabase;
+import com.microsoft.azure.datalake.analytics.models.USqlExternalDataSource;
+import com.microsoft.azure.datalake.analytics.models.USqlProcedure;
+import com.microsoft.azure.datalake.analytics.models.USqlSchema;
+import com.microsoft.azure.datalake.analytics.models.USqlSecret;
+import com.microsoft.azure.datalake.analytics.models.USqlTable;
+import com.microsoft.azure.datalake.analytics.models.USqlTablePartition;
+import com.microsoft.azure.datalake.analytics.models.USqlTableStatistics;
+import com.microsoft.azure.datalake.analytics.models.USqlTableType;
+import com.microsoft.azure.datalake.analytics.models.USqlTableValuedFunction;
+import com.microsoft.azure.datalake.analytics.models.USqlType;
+import com.microsoft.azure.datalake.analytics.models.USqlView;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Catalogs.
+ */
+public interface Catalogs {
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @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 USqlSecret object if successful.
+     */
+    USqlSecret createSecret(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlSecret> createSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, final ServiceCallback<USqlSecret> serviceCallback);
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<USqlSecret> createSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<ServiceResponse<USqlSecret>> createSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @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 USqlSecret object if successful.
+     */
+    USqlSecret updateSecret(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlSecret> updateSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, final ServiceCallback<USqlSecret> serviceCallback);
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<USqlSecret> updateSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<ServiceResponse<USqlSecret>> updateSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters);
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @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 USqlSecret object if successful.
+     */
+    USqlSecret getSecret(String accountName, String databaseName, String secretName);
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlSecret> getSecretAsync(String accountName, String databaseName, String secretName, final ServiceCallback<USqlSecret> serviceCallback);
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<USqlSecret> getSecretAsync(String accountName, String databaseName, String secretName);
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    Observable<ServiceResponse<USqlSecret>> getSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName);
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @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
+     */
+    void deleteSecret(String accountName, String databaseName, String secretName);
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<Void> deleteSecretAsync(String accountName, String databaseName, String secretName, final ServiceCallback<Void> serviceCallback);
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<Void> deleteSecretAsync(String accountName, String databaseName, String secretName);
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<ServiceResponse<Void>> deleteSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName);
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @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
+     */
+    void deleteAllSecrets(String accountName, String databaseName);
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<Void> deleteAllSecretsAsync(String accountName, String databaseName, final ServiceCallback<Void> serviceCallback);
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<Void> deleteAllSecretsAsync(String accountName, String databaseName);
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<ServiceResponse<Void>> deleteAllSecretsWithServiceResponseAsync(String accountName, String databaseName);
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @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 USqlExternalDataSource object if successful.
+     */
+    USqlExternalDataSource getExternalDataSource(String accountName, String databaseName, String externalDataSourceName);
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlExternalDataSource> getExternalDataSourceAsync(String accountName, String databaseName, String externalDataSourceName, final ServiceCallback<USqlExternalDataSource> serviceCallback);
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlExternalDataSource object
+     */
+    Observable<USqlExternalDataSource> getExternalDataSourceAsync(String accountName, String databaseName, String externalDataSourceName);
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlExternalDataSource object
+     */
+    Observable<ServiceResponse<USqlExternalDataSource>> getExternalDataSourceWithServiceResponseAsync(String accountName, String databaseName, String externalDataSourceName);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    PagedList<USqlExternalDataSource> listExternalDataSources(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlExternalDataSource> serviceCallback);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<Page<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesWithServiceResponseAsync(final String accountName, final String databaseName);
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    PagedList<USqlExternalDataSource> listExternalDataSources(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlExternalDataSource> serviceCallback);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<Page<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @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 USqlCredential object if successful.
+     */
+    USqlCredential getCredential(String accountName, String databaseName, String credentialName);
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlCredential> getCredentialAsync(String accountName, String databaseName, String credentialName, final ServiceCallback<USqlCredential> serviceCallback);
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlCredential object
+     */
+    Observable<USqlCredential> getCredentialAsync(String accountName, String databaseName, String credentialName);
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlCredential object
+     */
+    Observable<ServiceResponse<USqlCredential>> getCredentialWithServiceResponseAsync(String accountName, String databaseName, String credentialName);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    PagedList<USqlCredential> listCredentials(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlCredential> serviceCallback);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<Page<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsWithServiceResponseAsync(final String accountName, final String databaseName);
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    PagedList<USqlCredential> listCredentials(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlCredential> serviceCallback);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<Page<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @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 USqlProcedure object if successful.
+     */
+    USqlProcedure getProcedure(String accountName, String databaseName, String schemaName, String procedureName);
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlProcedure> getProcedureAsync(String accountName, String databaseName, String schemaName, String procedureName, final ServiceCallback<USqlProcedure> serviceCallback);
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlProcedure object
+     */
+    Observable<USqlProcedure> getProcedureAsync(String accountName, String databaseName, String schemaName, String procedureName);
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlProcedure object
+     */
+    Observable<ServiceResponse<USqlProcedure>> getProcedureWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String procedureName);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    PagedList<USqlProcedure> listProcedures(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlProcedure> serviceCallback);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<Page<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    PagedList<USqlProcedure> listProcedures(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlProcedure> serviceCallback);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<Page<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @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 USqlTable object if successful.
+     */
+    USqlTable getTable(String accountName, String databaseName, String schemaName, String tableName);
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlTable> getTableAsync(String accountName, String databaseName, String schemaName, String tableName, final ServiceCallback<USqlTable> serviceCallback);
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTable object
+     */
+    Observable<USqlTable> getTableAsync(String accountName, String databaseName, String schemaName, String tableName);
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTable object
+     */
+    Observable<ServiceResponse<USqlTable>> getTableWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    PagedList<USqlTable> listTables(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTable> serviceCallback);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<Page<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTable>>> listTablesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    PagedList<USqlTable> listTables(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTable> serviceCallback);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<Page<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTable>>> listTablesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @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 USqlTableType object if successful.
+     */
+    USqlTableType getTableType(String accountName, String databaseName, String schemaName, String tableTypeName);
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlTableType> getTableTypeAsync(String accountName, String databaseName, String schemaName, String tableTypeName, final ServiceCallback<USqlTableType> serviceCallback);
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableType object
+     */
+    Observable<USqlTableType> getTableTypeAsync(String accountName, String databaseName, String schemaName, String tableTypeName);
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableType object
+     */
+    Observable<ServiceResponse<USqlTableType>> getTableTypeWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableTypeName);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    PagedList<USqlTableType> listTableTypes(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTableType> serviceCallback);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<Page<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    PagedList<USqlTableType> listTableTypes(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableType> serviceCallback);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<Page<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @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 USqlView object if successful.
+     */
+    USqlView getView(String accountName, String databaseName, String schemaName, String viewName);
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlView> getViewAsync(String accountName, String databaseName, String schemaName, String viewName, final ServiceCallback<USqlView> serviceCallback);
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlView object
+     */
+    Observable<USqlView> getViewAsync(String accountName, String databaseName, String schemaName, String viewName);
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlView object
+     */
+    Observable<ServiceResponse<USqlView>> getViewWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String viewName);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    PagedList<USqlView> listViews(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlView> serviceCallback);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<Page<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlView>>> listViewsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    PagedList<USqlView> listViews(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlView> serviceCallback);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<Page<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlView>>> listViewsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @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 USqlTableStatistics object if successful.
+     */
+    USqlTableStatistics getTableStatistic(String accountName, String databaseName, String schemaName, String tableName, String statisticsName);
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlTableStatistics> getTableStatisticAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName, final ServiceCallback<USqlTableStatistics> serviceCallback);
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableStatistics object
+     */
+    Observable<USqlTableStatistics> getTableStatisticAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName);
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableStatistics object
+     */
+    Observable<ServiceResponse<USqlTableStatistics>> getTableStatisticWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    PagedList<USqlTableStatistics> listTableStatistics(final String accountName, final String databaseName, final String schemaName, final String tableName);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final ListOperationCallback<USqlTableStatistics> serviceCallback);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<Page<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName);
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    PagedList<USqlTableStatistics> listTableStatistics(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableStatistics> serviceCallback);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<Page<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @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 USqlTablePartition object if successful.
+     */
+    USqlTablePartition getTablePartition(String accountName, String databaseName, String schemaName, String tableName, String partitionName);
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlTablePartition> getTablePartitionAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName, final ServiceCallback<USqlTablePartition> serviceCallback);
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTablePartition object
+     */
+    Observable<USqlTablePartition> getTablePartitionAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName);
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTablePartition object
+     */
+    Observable<ServiceResponse<USqlTablePartition>> getTablePartitionWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    PagedList<USqlTablePartition> listTablePartitions(final String accountName, final String databaseName, final String schemaName, final String tableName);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final ListOperationCallback<USqlTablePartition> serviceCallback);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<Page<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName);
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    PagedList<USqlTablePartition> listTablePartitions(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTablePartition> serviceCallback);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<Page<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    PagedList<USqlType> listTypes(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlType> serviceCallback);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<Page<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlType>>> listTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    PagedList<USqlType> listTypes(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlType> serviceCallback);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<Page<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlType>>> listTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @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 USqlTableValuedFunction object if successful.
+     */
+    USqlTableValuedFunction getTableValuedFunction(String accountName, String databaseName, String schemaName, String tableValuedFunctionName);
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlTableValuedFunction> getTableValuedFunctionAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName, final ServiceCallback<USqlTableValuedFunction> serviceCallback);
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableValuedFunction object
+     */
+    Observable<USqlTableValuedFunction> getTableValuedFunctionAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName);
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableValuedFunction object
+     */
+    Observable<ServiceResponse<USqlTableValuedFunction>> getTableValuedFunctionWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    PagedList<USqlTableValuedFunction> listTableValuedFunctions(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTableValuedFunction> serviceCallback);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName);
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    PagedList<USqlTableValuedFunction> listTableValuedFunctions(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableValuedFunction> serviceCallback);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @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 USqlAssembly object if successful.
+     */
+    USqlAssembly getAssembly(String accountName, String databaseName, String assemblyName);
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlAssembly> getAssemblyAsync(String accountName, String databaseName, String assemblyName, final ServiceCallback<USqlAssembly> serviceCallback);
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlAssembly object
+     */
+    Observable<USqlAssembly> getAssemblyAsync(String accountName, String databaseName, String assemblyName);
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlAssembly object
+     */
+    Observable<ServiceResponse<USqlAssembly>> getAssemblyWithServiceResponseAsync(String accountName, String databaseName, String assemblyName);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    PagedList<USqlAssemblyClr> listAssemblies(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlAssemblyClr> serviceCallback);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<Page<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesWithServiceResponseAsync(final String accountName, final String databaseName);
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    PagedList<USqlAssemblyClr> listAssemblies(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlAssemblyClr> serviceCallback);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<Page<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @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 USqlSchema object if successful.
+     */
+    USqlSchema getSchema(String accountName, String databaseName, String schemaName);
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlSchema> getSchemaAsync(String accountName, String databaseName, String schemaName, final ServiceCallback<USqlSchema> serviceCallback);
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSchema object
+     */
+    Observable<USqlSchema> getSchemaAsync(String accountName, String databaseName, String schemaName);
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSchema object
+     */
+    Observable<ServiceResponse<USqlSchema>> getSchemaWithServiceResponseAsync(String accountName, String databaseName, String schemaName);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    PagedList<USqlSchema> listSchemas(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlSchema> serviceCallback);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<Page<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlSchema>>> listSchemasWithServiceResponseAsync(final String accountName, final String databaseName);
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    PagedList<USqlSchema> listSchemas(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlSchema> serviceCallback);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<Page<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlSchema>>> listSchemasWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @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 USqlDatabase object if successful.
+     */
+    USqlDatabase getDatabase(String accountName, String databaseName);
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<USqlDatabase> getDatabaseAsync(String accountName, String databaseName, final ServiceCallback<USqlDatabase> serviceCallback);
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlDatabase object
+     */
+    Observable<USqlDatabase> getDatabaseAsync(String accountName, String databaseName);
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlDatabase object
+     */
+    Observable<ServiceResponse<USqlDatabase>> getDatabaseWithServiceResponseAsync(String accountName, String databaseName);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    PagedList<USqlDatabase> listDatabases(final String accountName);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlDatabase>> listDatabasesAsync(final String accountName, final ListOperationCallback<USqlDatabase> serviceCallback);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<Page<USqlDatabase>> listDatabasesAsync(final String accountName);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesWithServiceResponseAsync(final String accountName);
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    PagedList<USqlDatabase> listDatabases(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlDatabase>> listDatabasesAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlDatabase> serviceCallback);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<Page<USqlDatabase>> listDatabasesAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesWithServiceResponseAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    PagedList<USqlExternalDataSource> listExternalDataSourcesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlExternalDataSource>> listExternalDataSourcesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlExternalDataSource>> serviceFuture, final ListOperationCallback<USqlExternalDataSource> serviceCallback);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<Page<USqlExternalDataSource>> listExternalDataSourcesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    PagedList<USqlCredential> listCredentialsNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlCredential>> listCredentialsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlCredential>> serviceFuture, final ListOperationCallback<USqlCredential> serviceCallback);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<Page<USqlCredential>> listCredentialsNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    PagedList<USqlProcedure> listProceduresNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlProcedure>> listProceduresNextAsync(final String nextPageLink, final ServiceFuture<List<USqlProcedure>> serviceFuture, final ListOperationCallback<USqlProcedure> serviceCallback);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<Page<USqlProcedure>> listProceduresNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    PagedList<USqlTable> listTablesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTable>> listTablesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTable>> serviceFuture, final ListOperationCallback<USqlTable> serviceCallback);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<Page<USqlTable>> listTablesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTable>>> listTablesNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    PagedList<USqlTableType> listTableTypesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableType>> listTableTypesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableType>> serviceFuture, final ListOperationCallback<USqlTableType> serviceCallback);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<Page<USqlTableType>> listTableTypesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    PagedList<USqlView> listViewsNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlView>> listViewsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlView>> serviceFuture, final ListOperationCallback<USqlView> serviceCallback);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<Page<USqlView>> listViewsNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlView>>> listViewsNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    PagedList<USqlTableStatistics> listTableStatisticsNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableStatistics>> listTableStatisticsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableStatistics>> serviceFuture, final ListOperationCallback<USqlTableStatistics> serviceCallback);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<Page<USqlTableStatistics>> listTableStatisticsNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    PagedList<USqlTablePartition> listTablePartitionsNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTablePartition>> listTablePartitionsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTablePartition>> serviceFuture, final ListOperationCallback<USqlTablePartition> serviceCallback);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<Page<USqlTablePartition>> listTablePartitionsNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    PagedList<USqlType> listTypesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlType>> listTypesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlType>> serviceFuture, final ListOperationCallback<USqlType> serviceCallback);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<Page<USqlType>> listTypesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlType>>> listTypesNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    PagedList<USqlTableValuedFunction> listTableValuedFunctionsNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlTableValuedFunction>> listTableValuedFunctionsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableValuedFunction>> serviceFuture, final ListOperationCallback<USqlTableValuedFunction> serviceCallback);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    PagedList<USqlAssemblyClr> listAssembliesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlAssemblyClr>> listAssembliesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlAssemblyClr>> serviceFuture, final ListOperationCallback<USqlAssemblyClr> serviceCallback);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<Page<USqlAssemblyClr>> listAssembliesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    PagedList<USqlSchema> listSchemasNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlSchema>> listSchemasNextAsync(final String nextPageLink, final ServiceFuture<List<USqlSchema>> serviceFuture, final ListOperationCallback<USqlSchema> serviceCallback);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<Page<USqlSchema>> listSchemasNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlSchema>>> listSchemasNextWithServiceResponseAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    PagedList<USqlDatabase> listDatabasesNext(final String nextPageLink);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<USqlDatabase>> listDatabasesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlDatabase>> serviceFuture, final ListOperationCallback<USqlDatabase> serviceCallback);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<Page<USqlDatabase>> listDatabasesNextAsync(final String nextPageLink);
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesNextWithServiceResponseAsync(final String nextPageLink);
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java
new file mode 100644
index 000000000000..87cf12462132
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsCatalogManagementClient.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.rest.RestClient;
+
+/**
+ * The interface for DataLakeAnalyticsCatalogManagementClient class.
+ */
+public interface DataLakeAnalyticsCatalogManagementClient {
+    /**
+     * Gets the REST client.
+     *
+     * @return the {@link RestClient} object.
+    */
+    RestClient restClient();
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    AzureClient getAzureClient();
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    String userAgent();
+
+    /**
+     * Gets Client Api Version..
+     *
+     * @return the apiVersion value.
+     */
+    String apiVersion();
+
+    /**
+     * Gets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Catalog service requests..
+     *
+     * @return the adlaCatalogDnsSuffix value.
+     */
+    String adlaCatalogDnsSuffix();
+
+    /**
+     * Sets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Catalog service requests..
+     *
+     * @param adlaCatalogDnsSuffix the adlaCatalogDnsSuffix value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsCatalogManagementClient withAdlaCatalogDnsSuffix(String adlaCatalogDnsSuffix);
+
+    /**
+     * Gets Gets or sets the preferred language for the response..
+     *
+     * @return the acceptLanguage value.
+     */
+    String acceptLanguage();
+
+    /**
+     * Sets Gets or sets the preferred language for the response..
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsCatalogManagementClient withAcceptLanguage(String acceptLanguage);
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30..
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    int longRunningOperationRetryTimeout();
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30..
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsCatalogManagementClient withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout);
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true..
+     *
+     * @return the generateClientRequestId value.
+     */
+    boolean generateClientRequestId();
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true..
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsCatalogManagementClient withGenerateClientRequestId(boolean generateClientRequestId);
+
+    /**
+     * Gets the Catalogs object to access its operations.
+     * @return the Catalogs object.
+     */
+    Catalogs catalogs();
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsJobManagementClient.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsJobManagementClient.java
new file mode 100644
index 000000000000..e2ba89aeb5a5
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/DataLakeAnalyticsJobManagementClient.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.rest.RestClient;
+
+/**
+ * The interface for DataLakeAnalyticsJobManagementClient class.
+ */
+public interface DataLakeAnalyticsJobManagementClient {
+    /**
+     * Gets the REST client.
+     *
+     * @return the {@link RestClient} object.
+    */
+    RestClient restClient();
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    AzureClient getAzureClient();
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    String userAgent();
+
+    /**
+     * Gets Client Api Version..
+     *
+     * @return the apiVersion value.
+     */
+    String apiVersion();
+
+    /**
+     * Gets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests..
+     *
+     * @return the adlaJobDnsSuffix value.
+     */
+    String adlaJobDnsSuffix();
+
+    /**
+     * Sets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests..
+     *
+     * @param adlaJobDnsSuffix the adlaJobDnsSuffix value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsJobManagementClient withAdlaJobDnsSuffix(String adlaJobDnsSuffix);
+
+    /**
+     * Gets Gets or sets the preferred language for the response..
+     *
+     * @return the acceptLanguage value.
+     */
+    String acceptLanguage();
+
+    /**
+     * Sets Gets or sets the preferred language for the response..
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsJobManagementClient withAcceptLanguage(String acceptLanguage);
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30..
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    int longRunningOperationRetryTimeout();
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30..
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsJobManagementClient withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout);
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true..
+     *
+     * @return the generateClientRequestId value.
+     */
+    boolean generateClientRequestId();
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true..
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    DataLakeAnalyticsJobManagementClient withGenerateClientRequestId(boolean generateClientRequestId);
+
+    /**
+     * Gets the Jobs object to access its operations.
+     * @return the Jobs object.
+     */
+    Jobs jobs();
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Jobs.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Jobs.java
new file mode 100644
index 000000000000..fe6ecd60919d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Jobs.java
@@ -0,0 +1,445 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobDataPath;
+import com.microsoft.azure.datalake.analytics.models.JobInformation;
+import com.microsoft.azure.datalake.analytics.models.JobStatistics;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Jobs.
+ */
+public interface Jobs {
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobStatistics object if successful.
+     */
+    JobStatistics getStatistics(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobStatistics> getStatisticsAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobStatistics> serviceCallback);
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobStatistics object
+     */
+    Observable<JobStatistics> getStatisticsAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobStatistics object
+     */
+    Observable<ServiceResponse<JobStatistics>> getStatisticsWithServiceResponseAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobDataPath object if successful.
+     */
+    JobDataPath getDebugDataPath(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobDataPath> getDebugDataPathAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobDataPath> serviceCallback);
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobDataPath object
+     */
+    Observable<JobDataPath> getDebugDataPathAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobDataPath object
+     */
+    Observable<ServiceResponse<JobDataPath>> getDebugDataPathWithServiceResponseAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @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 JobInformation object if successful.
+     */
+    JobInformation build(String accountName, JobInformation parameters);
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobInformation> buildAsync(String accountName, JobInformation parameters, final ServiceCallback<JobInformation> serviceCallback);
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<JobInformation> buildAsync(String accountName, JobInformation parameters);
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<ServiceResponse<JobInformation>> buildWithServiceResponseAsync(String accountName, JobInformation parameters);
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @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
+     */
+    void cancel(String accountName, UUID jobIdentity);
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<Void> cancelAsync(String accountName, UUID jobIdentity, final ServiceCallback<Void> serviceCallback);
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<Void> cancelAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    Observable<ServiceResponse<Void>> cancelWithServiceResponseAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobInformation object if successful.
+     */
+    JobInformation get(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobInformation> getAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobInformation> serviceCallback);
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<JobInformation> getAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<ServiceResponse<JobInformation>> getWithServiceResponseAsync(String accountName, UUID jobIdentity);
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @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 JobInformation object if successful.
+     */
+    JobInformation create(String accountName, UUID jobIdentity, JobInformation parameters);
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobInformation> createAsync(String accountName, UUID jobIdentity, JobInformation parameters, final ServiceCallback<JobInformation> serviceCallback);
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<JobInformation> createAsync(String accountName, UUID jobIdentity, JobInformation parameters);
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    Observable<ServiceResponse<JobInformation>> createWithServiceResponseAsync(String accountName, UUID jobIdentity, JobInformation parameters);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    PagedList<JobInformation> list(final String accountName);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobInformation>> listAsync(final String accountName, final ListOperationCallback<JobInformation> serviceCallback);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<Page<JobInformation>> listAsync(final String accountName);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobInformation>>> listWithServiceResponseAsync(final String accountName);
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    PagedList<JobInformation> list(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobInformation>> listAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format, final ListOperationCallback<JobInformation> serviceCallback);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<Page<JobInformation>> listAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobInformation>>> listWithServiceResponseAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    PagedList<JobInformation> listNext(final String nextPageLink);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobInformation>> serviceFuture, final ListOperationCallback<JobInformation> serviceCallback);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<Page<JobInformation>> listNextAsync(final String nextPageLink);
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobInformation>>> listNextWithServiceResponseAsync(final String nextPageLink);
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Pipelines.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Pipelines.java
new file mode 100644
index 000000000000..25c51b69fc6a
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Pipelines.java
@@ -0,0 +1,248 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobPipelineInformation;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import org.joda.time.DateTime;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Pipelines.
+ */
+public interface Pipelines {
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    PagedList<JobPipelineInformation> list(final String accountName);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobPipelineInformation>> listAsync(final String accountName, final ListOperationCallback<JobPipelineInformation> serviceCallback);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<Page<JobPipelineInformation>> listAsync(final String accountName);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobPipelineInformation>>> listWithServiceResponseAsync(final String accountName);
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    PagedList<JobPipelineInformation> list(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobPipelineInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime, final ListOperationCallback<JobPipelineInformation> serviceCallback);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<Page<JobPipelineInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobPipelineInformation>>> listWithServiceResponseAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @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 JobPipelineInformation object if successful.
+     */
+    JobPipelineInformation get(String accountName, UUID pipelineIdentity);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, final ServiceCallback<JobPipelineInformation> serviceCallback);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    Observable<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    Observable<ServiceResponse<JobPipelineInformation>> getWithServiceResponseAsync(String accountName, UUID pipelineIdentity);
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 JobPipelineInformation object if successful.
+     */
+    JobPipelineInformation get(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime, final ServiceCallback<JobPipelineInformation> serviceCallback);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    Observable<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    Observable<ServiceResponse<JobPipelineInformation>> getWithServiceResponseAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    PagedList<JobPipelineInformation> listNext(final String nextPageLink);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobPipelineInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobPipelineInformation>> serviceFuture, final ListOperationCallback<JobPipelineInformation> serviceCallback);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<Page<JobPipelineInformation>> listNextAsync(final String nextPageLink);
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobPipelineInformation>>> listNextWithServiceResponseAsync(final String nextPageLink);
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Recurrences.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Recurrences.java
new file mode 100644
index 000000000000..5d51a449b74b
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/Recurrences.java
@@ -0,0 +1,248 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics;
+
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobRecurrenceInformation;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import org.joda.time.DateTime;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Recurrences.
+ */
+public interface Recurrences {
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    PagedList<JobRecurrenceInformation> list(final String accountName);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobRecurrenceInformation>> listAsync(final String accountName, final ListOperationCallback<JobRecurrenceInformation> serviceCallback);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<Page<JobRecurrenceInformation>> listAsync(final String accountName);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listWithServiceResponseAsync(final String accountName);
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    PagedList<JobRecurrenceInformation> list(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobRecurrenceInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime, final ListOperationCallback<JobRecurrenceInformation> serviceCallback);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<Page<JobRecurrenceInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listWithServiceResponseAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @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 JobRecurrenceInformation object if successful.
+     */
+    JobRecurrenceInformation get(String accountName, UUID recurrenceIdentity);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, final ServiceCallback<JobRecurrenceInformation> serviceCallback);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    Observable<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    Observable<ServiceResponse<JobRecurrenceInformation>> getWithServiceResponseAsync(String accountName, UUID recurrenceIdentity);
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 JobRecurrenceInformation object if successful.
+     */
+    JobRecurrenceInformation get(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime, final ServiceCallback<JobRecurrenceInformation> serviceCallback);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    Observable<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    Observable<ServiceResponse<JobRecurrenceInformation>> getWithServiceResponseAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    PagedList<JobRecurrenceInformation> listNext(final String nextPageLink);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    ServiceFuture<List<JobRecurrenceInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobRecurrenceInformation>> serviceFuture, final ListOperationCallback<JobRecurrenceInformation> serviceCallback);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<Page<JobRecurrenceInformation>> listNextAsync(final String nextPageLink);
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listNextWithServiceResponseAsync(final String nextPageLink);
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/CatalogsImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/CatalogsImpl.java
new file mode 100644
index 000000000000..9207cc8fde5c
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/CatalogsImpl.java
@@ -0,0 +1,7185 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import retrofit2.Retrofit;
+import com.microsoft.azure.datalake.analytics.Catalogs;
+import com.google.common.base.Joiner;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters;
+import com.microsoft.azure.datalake.analytics.models.PageImpl;
+import com.microsoft.azure.datalake.analytics.models.USqlAssembly;
+import com.microsoft.azure.datalake.analytics.models.USqlAssemblyClr;
+import com.microsoft.azure.datalake.analytics.models.USqlCredential;
+import com.microsoft.azure.datalake.analytics.models.USqlDatabase;
+import com.microsoft.azure.datalake.analytics.models.USqlExternalDataSource;
+import com.microsoft.azure.datalake.analytics.models.USqlProcedure;
+import com.microsoft.azure.datalake.analytics.models.USqlSchema;
+import com.microsoft.azure.datalake.analytics.models.USqlSecret;
+import com.microsoft.azure.datalake.analytics.models.USqlTable;
+import com.microsoft.azure.datalake.analytics.models.USqlTablePartition;
+import com.microsoft.azure.datalake.analytics.models.USqlTableStatistics;
+import com.microsoft.azure.datalake.analytics.models.USqlTableType;
+import com.microsoft.azure.datalake.analytics.models.USqlTableValuedFunction;
+import com.microsoft.azure.datalake.analytics.models.USqlType;
+import com.microsoft.azure.datalake.analytics.models.USqlView;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Catalogs.
+ */
+public class CatalogsImpl implements Catalogs {
+    /** The Retrofit service to perform REST calls. */
+    private CatalogsService service;
+    /** The service client containing this operation class. */
+    private DataLakeAnalyticsCatalogManagementClientImpl client;
+
+    /**
+     * Initializes an instance of CatalogsImpl.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public CatalogsImpl(Retrofit retrofit, DataLakeAnalyticsCatalogManagementClientImpl client) {
+        this.service = retrofit.create(CatalogsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Catalogs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface CatalogsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs createSecret" })
+        @PUT("catalog/usql/databases/{databaseName}/secrets/{secretName}")
+        Observable<Response<ResponseBody>> createSecret(@Path("databaseName") String databaseName, @Path("secretName") String secretName, @Body DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs updateSecret" })
+        @PATCH("catalog/usql/databases/{databaseName}/secrets/{secretName}")
+        Observable<Response<ResponseBody>> updateSecret(@Path("databaseName") String databaseName, @Path("secretName") String secretName, @Body DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getSecret" })
+        @GET("catalog/usql/databases/{databaseName}/secrets/{secretName}")
+        Observable<Response<ResponseBody>> getSecret(@Path("databaseName") String databaseName, @Path("secretName") String secretName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs deleteSecret" })
+        @HTTP(path = "catalog/usql/databases/{databaseName}/secrets/{secretName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteSecret(@Path("databaseName") String databaseName, @Path("secretName") String secretName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs deleteAllSecrets" })
+        @HTTP(path = "catalog/usql/databases/{databaseName}/secrets", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAllSecrets(@Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getExternalDataSource" })
+        @GET("catalog/usql/databases/{databaseName}/externaldatasources/{externalDataSourceName}")
+        Observable<Response<ResponseBody>> getExternalDataSource(@Path("databaseName") String databaseName, @Path("externalDataSourceName") String externalDataSourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listExternalDataSources" })
+        @GET("catalog/usql/databases/{databaseName}/externaldatasources")
+        Observable<Response<ResponseBody>> listExternalDataSources(@Path("databaseName") String databaseName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getCredential" })
+        @GET("catalog/usql/databases/{databaseName}/credentials/{credentialName}")
+        Observable<Response<ResponseBody>> getCredential(@Path("databaseName") String databaseName, @Path("credentialName") String credentialName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listCredentials" })
+        @GET("catalog/usql/databases/{databaseName}/credentials")
+        Observable<Response<ResponseBody>> listCredentials(@Path("databaseName") String databaseName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getProcedure" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/procedures/{procedureName}")
+        Observable<Response<ResponseBody>> getProcedure(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("procedureName") String procedureName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listProcedures" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/procedures")
+        Observable<Response<ResponseBody>> listProcedures(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getTable" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}")
+        Observable<Response<ResponseBody>> getTable(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTables" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables")
+        Observable<Response<ResponseBody>> listTables(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getTableType" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tabletypes/{tableTypeName}")
+        Observable<Response<ResponseBody>> getTableType(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableTypeName") String tableTypeName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableTypes" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tabletypes")
+        Observable<Response<ResponseBody>> listTableTypes(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getView" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/views/{viewName}")
+        Observable<Response<ResponseBody>> getView(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("viewName") String viewName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listViews" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/views")
+        Observable<Response<ResponseBody>> listViews(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getTableStatistic" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/statistics/{statisticsName}")
+        Observable<Response<ResponseBody>> getTableStatistic(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("statisticsName") String statisticsName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableStatistics" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/statistics")
+        Observable<Response<ResponseBody>> listTableStatistics(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getTablePartition" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/partitions/{partitionName}")
+        Observable<Response<ResponseBody>> getTablePartition(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Path("partitionName") String partitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTablePartitions" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tables/{tableName}/partitions")
+        Observable<Response<ResponseBody>> listTablePartitions(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableName") String tableName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTypes" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/types")
+        Observable<Response<ResponseBody>> listTypes(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getTableValuedFunction" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tablevaluedfunctions/{tableValuedFunctionName}")
+        Observable<Response<ResponseBody>> getTableValuedFunction(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Path("tableValuedFunctionName") String tableValuedFunctionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableValuedFunctions" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}/tablevaluedfunctions")
+        Observable<Response<ResponseBody>> listTableValuedFunctions(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getAssembly" })
+        @GET("catalog/usql/databases/{databaseName}/assemblies/{assemblyName}")
+        Observable<Response<ResponseBody>> getAssembly(@Path("databaseName") String databaseName, @Path("assemblyName") String assemblyName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listAssemblies" })
+        @GET("catalog/usql/databases/{databaseName}/assemblies")
+        Observable<Response<ResponseBody>> listAssemblies(@Path("databaseName") String databaseName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getSchema" })
+        @GET("catalog/usql/databases/{databaseName}/schemas/{schemaName}")
+        Observable<Response<ResponseBody>> getSchema(@Path("databaseName") String databaseName, @Path("schemaName") String schemaName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listSchemas" })
+        @GET("catalog/usql/databases/{databaseName}/schemas")
+        Observable<Response<ResponseBody>> listSchemas(@Path("databaseName") String databaseName, @Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs getDatabase" })
+        @GET("catalog/usql/databases/{databaseName}")
+        Observable<Response<ResponseBody>> getDatabase(@Path("databaseName") String databaseName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listDatabases" })
+        @GET("catalog/usql/databases")
+        Observable<Response<ResponseBody>> listDatabases(@Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listExternalDataSourcesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listExternalDataSourcesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listCredentialsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listCredentialsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listProceduresNext" })
+        @GET
+        Observable<Response<ResponseBody>> listProceduresNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTablesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTablesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableTypesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTableTypesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listViewsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listViewsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableStatisticsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTableStatisticsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTablePartitionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTablePartitionsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTypesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTypesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listTableValuedFunctionsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listTableValuedFunctionsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listAssembliesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listAssembliesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listSchemasNext" })
+        @GET
+        Observable<Response<ResponseBody>> listSchemasNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Catalogs listDatabasesNext" })
+        @GET
+        Observable<Response<ResponseBody>> listDatabasesNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @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 USqlSecret object if successful.
+     */
+    public USqlSecret createSecret(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        return createSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @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<USqlSecret> createSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, final ServiceCallback<USqlSecret> serviceCallback) {
+        return ServiceFuture.fromResponse(createSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<USqlSecret> createSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        return createSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters).map(new Func1<ServiceResponse<USqlSecret>, USqlSecret>() {
+            @Override
+            public USqlSecret call(ServiceResponse<USqlSecret> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database in which to create the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to create the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<ServiceResponse<USqlSecret>> createSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (secretName == null) {
+            throw new IllegalArgumentException("Parameter secretName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.createSecret(databaseName, secretName, parameters, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlSecret>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlSecret>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlSecret> clientResponse = createSecretDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlSecret> createSecretDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlSecret, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlSecret>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @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 USqlSecret object if successful.
+     */
+    public USqlSecret updateSecret(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        return updateSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @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<USqlSecret> updateSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters, final ServiceCallback<USqlSecret> serviceCallback) {
+        return ServiceFuture.fromResponse(updateSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters), serviceCallback);
+    }
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<USqlSecret> updateSecretAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        return updateSecretWithServiceResponseAsync(accountName, databaseName, secretName, parameters).map(new Func1<ServiceResponse<USqlSecret>, USqlSecret>() {
+            @Override
+            public USqlSecret call(ServiceResponse<USqlSecret> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Modifies the specified secret for use with external data sources in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret.
+     * @param parameters The parameters required to modify the secret (name and password)
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<ServiceResponse<USqlSecret>> updateSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName, DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters parameters) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (secretName == null) {
+            throw new IllegalArgumentException("Parameter secretName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.updateSecret(databaseName, secretName, parameters, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlSecret>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlSecret>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlSecret> clientResponse = updateSecretDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlSecret> updateSecretDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlSecret, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlSecret>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @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 USqlSecret object if successful.
+     */
+    public USqlSecret getSecret(String accountName, String databaseName, String secretName) {
+        return getSecretWithServiceResponseAsync(accountName, databaseName, secretName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @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<USqlSecret> getSecretAsync(String accountName, String databaseName, String secretName, final ServiceCallback<USqlSecret> serviceCallback) {
+        return ServiceFuture.fromResponse(getSecretWithServiceResponseAsync(accountName, databaseName, secretName), serviceCallback);
+    }
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<USqlSecret> getSecretAsync(String accountName, String databaseName, String secretName) {
+        return getSecretWithServiceResponseAsync(accountName, databaseName, secretName).map(new Func1<ServiceResponse<USqlSecret>, USqlSecret>() {
+            @Override
+            public USqlSecret call(ServiceResponse<USqlSecret> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to get
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSecret object
+     */
+    public Observable<ServiceResponse<USqlSecret>> getSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (secretName == null) {
+            throw new IllegalArgumentException("Parameter secretName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getSecret(databaseName, secretName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlSecret>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlSecret>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlSecret> clientResponse = getSecretDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlSecret> getSecretDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlSecret, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlSecret>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @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
+     */
+    public void deleteSecret(String accountName, String databaseName, String secretName) {
+        deleteSecretWithServiceResponseAsync(accountName, databaseName, secretName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @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<Void> deleteSecretAsync(String accountName, String databaseName, String secretName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteSecretWithServiceResponseAsync(accountName, databaseName, secretName), serviceCallback);
+    }
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteSecretAsync(String accountName, String databaseName, String secretName) {
+        return deleteSecretWithServiceResponseAsync(accountName, databaseName, secretName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the specified secret in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @param secretName The name of the secret to delete
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteSecretWithServiceResponseAsync(String accountName, String databaseName, String secretName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (secretName == null) {
+            throw new IllegalArgumentException("Parameter secretName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.deleteSecret(databaseName, secretName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteSecretDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteSecretDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @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
+     */
+    public void deleteAllSecrets(String accountName, String databaseName) {
+        deleteAllSecretsWithServiceResponseAsync(accountName, databaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @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<Void> deleteAllSecretsAsync(String accountName, String databaseName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAllSecretsWithServiceResponseAsync(accountName, databaseName), serviceCallback);
+    }
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAllSecretsAsync(String accountName, String databaseName) {
+        return deleteAllSecretsWithServiceResponseAsync(accountName, databaseName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes all secrets in the specified database.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the secret.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAllSecretsWithServiceResponseAsync(String accountName, String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.deleteAllSecrets(databaseName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAllSecretsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAllSecretsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @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 USqlExternalDataSource object if successful.
+     */
+    public USqlExternalDataSource getExternalDataSource(String accountName, String databaseName, String externalDataSourceName) {
+        return getExternalDataSourceWithServiceResponseAsync(accountName, databaseName, externalDataSourceName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @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<USqlExternalDataSource> getExternalDataSourceAsync(String accountName, String databaseName, String externalDataSourceName, final ServiceCallback<USqlExternalDataSource> serviceCallback) {
+        return ServiceFuture.fromResponse(getExternalDataSourceWithServiceResponseAsync(accountName, databaseName, externalDataSourceName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlExternalDataSource object
+     */
+    public Observable<USqlExternalDataSource> getExternalDataSourceAsync(String accountName, String databaseName, String externalDataSourceName) {
+        return getExternalDataSourceWithServiceResponseAsync(accountName, databaseName, externalDataSourceName).map(new Func1<ServiceResponse<USqlExternalDataSource>, USqlExternalDataSource>() {
+            @Override
+            public USqlExternalDataSource call(ServiceResponse<USqlExternalDataSource> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified external data source from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data source.
+     * @param externalDataSourceName The name of the external data source.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlExternalDataSource object
+     */
+    public Observable<ServiceResponse<USqlExternalDataSource>> getExternalDataSourceWithServiceResponseAsync(String accountName, String databaseName, String externalDataSourceName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (externalDataSourceName == null) {
+            throw new IllegalArgumentException("Parameter externalDataSourceName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getExternalDataSource(databaseName, externalDataSourceName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlExternalDataSource>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlExternalDataSource>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlExternalDataSource> clientResponse = getExternalDataSourceDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlExternalDataSource> getExternalDataSourceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlExternalDataSource, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlExternalDataSource>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    public PagedList<USqlExternalDataSource> listExternalDataSources(final String accountName, final String databaseName) {
+        ServiceResponse<Page<USqlExternalDataSource>> response = listExternalDataSourcesSinglePageAsync(accountName, databaseName).toBlocking().single();
+        return new PagedList<USqlExternalDataSource>(response.body()) {
+            @Override
+            public Page<USqlExternalDataSource> nextPage(String nextPageLink) {
+                return listExternalDataSourcesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @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<List<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlExternalDataSource> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listExternalDataSourcesSinglePageAsync(accountName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(String nextPageLink) {
+                    return listExternalDataSourcesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<Page<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName) {
+        return listExternalDataSourcesWithServiceResponseAsync(accountName, databaseName)
+            .map(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Page<USqlExternalDataSource>>() {
+                @Override
+                public Page<USqlExternalDataSource> call(ServiceResponse<Page<USqlExternalDataSource>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesWithServiceResponseAsync(final String accountName, final String databaseName) {
+        return listExternalDataSourcesSinglePageAsync(accountName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(ServiceResponse<Page<USqlExternalDataSource>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listExternalDataSourcesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlExternalDataSource&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesSinglePageAsync(final String accountName, final String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listExternalDataSources(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlExternalDataSource>> result = listExternalDataSourcesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlExternalDataSource>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    public PagedList<USqlExternalDataSource> listExternalDataSources(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlExternalDataSource>> response = listExternalDataSourcesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlExternalDataSource>(response.body()) {
+            @Override
+            public Page<USqlExternalDataSource> nextPage(String nextPageLink) {
+                return listExternalDataSourcesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlExternalDataSource> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listExternalDataSourcesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(String nextPageLink) {
+                    return listExternalDataSourcesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<Page<USqlExternalDataSource>> listExternalDataSourcesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listExternalDataSourcesWithServiceResponseAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Page<USqlExternalDataSource>>() {
+                @Override
+                public Page<USqlExternalDataSource> call(ServiceResponse<Page<USqlExternalDataSource>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the external data sources.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listExternalDataSourcesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(ServiceResponse<Page<USqlExternalDataSource>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listExternalDataSourcesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param databaseName The name of the database containing the external data sources.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlExternalDataSource&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesSinglePageAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listExternalDataSources(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlExternalDataSource>> result = listExternalDataSourcesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlExternalDataSource>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlExternalDataSource>> listExternalDataSourcesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlExternalDataSource>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlExternalDataSource>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @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 USqlCredential object if successful.
+     */
+    public USqlCredential getCredential(String accountName, String databaseName, String credentialName) {
+        return getCredentialWithServiceResponseAsync(accountName, databaseName, credentialName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @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<USqlCredential> getCredentialAsync(String accountName, String databaseName, String credentialName, final ServiceCallback<USqlCredential> serviceCallback) {
+        return ServiceFuture.fromResponse(getCredentialWithServiceResponseAsync(accountName, databaseName, credentialName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlCredential object
+     */
+    public Observable<USqlCredential> getCredentialAsync(String accountName, String databaseName, String credentialName) {
+        return getCredentialWithServiceResponseAsync(accountName, databaseName, credentialName).map(new Func1<ServiceResponse<USqlCredential>, USqlCredential>() {
+            @Override
+            public USqlCredential call(ServiceResponse<USqlCredential> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified credential from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param credentialName The name of the credential.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlCredential object
+     */
+    public Observable<ServiceResponse<USqlCredential>> getCredentialWithServiceResponseAsync(String accountName, String databaseName, String credentialName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (credentialName == null) {
+            throw new IllegalArgumentException("Parameter credentialName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getCredential(databaseName, credentialName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlCredential>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlCredential>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlCredential> clientResponse = getCredentialDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlCredential> getCredentialDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlCredential, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlCredential>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    public PagedList<USqlCredential> listCredentials(final String accountName, final String databaseName) {
+        ServiceResponse<Page<USqlCredential>> response = listCredentialsSinglePageAsync(accountName, databaseName).toBlocking().single();
+        return new PagedList<USqlCredential>(response.body()) {
+            @Override
+            public Page<USqlCredential> nextPage(String nextPageLink) {
+                return listCredentialsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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<List<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlCredential> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCredentialsSinglePageAsync(accountName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(String nextPageLink) {
+                    return listCredentialsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<Page<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName) {
+        return listCredentialsWithServiceResponseAsync(accountName, databaseName)
+            .map(new Func1<ServiceResponse<Page<USqlCredential>>, Page<USqlCredential>>() {
+                @Override
+                public Page<USqlCredential> call(ServiceResponse<Page<USqlCredential>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsWithServiceResponseAsync(final String accountName, final String databaseName) {
+        return listCredentialsSinglePageAsync(accountName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlCredential>>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(ServiceResponse<Page<USqlCredential>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCredentialsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlCredential&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsSinglePageAsync(final String accountName, final String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listCredentials(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlCredential>> result = listCredentialsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlCredential>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    public PagedList<USqlCredential> listCredentials(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlCredential>> response = listCredentialsSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlCredential>(response.body()) {
+            @Override
+            public Page<USqlCredential> nextPage(String nextPageLink) {
+                return listCredentialsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlCredential> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCredentialsSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(String nextPageLink) {
+                    return listCredentialsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<Page<USqlCredential>> listCredentialsAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listCredentialsWithServiceResponseAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlCredential>>, Page<USqlCredential>>() {
+                @Override
+                public Page<USqlCredential> call(ServiceResponse<Page<USqlCredential>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listCredentialsSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlCredential>>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(ServiceResponse<Page<USqlCredential>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCredentialsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlCredential>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlCredential>> * @param databaseName The name of the database containing the schema.
+    ServiceResponse<PageImpl<USqlCredential>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlCredential>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlCredential&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsSinglePageAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listCredentials(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlCredential>> result = listCredentialsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlCredential>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlCredential>> listCredentialsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlCredential>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlCredential>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @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 USqlProcedure object if successful.
+     */
+    public USqlProcedure getProcedure(String accountName, String databaseName, String schemaName, String procedureName) {
+        return getProcedureWithServiceResponseAsync(accountName, databaseName, schemaName, procedureName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @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<USqlProcedure> getProcedureAsync(String accountName, String databaseName, String schemaName, String procedureName, final ServiceCallback<USqlProcedure> serviceCallback) {
+        return ServiceFuture.fromResponse(getProcedureWithServiceResponseAsync(accountName, databaseName, schemaName, procedureName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlProcedure object
+     */
+    public Observable<USqlProcedure> getProcedureAsync(String accountName, String databaseName, String schemaName, String procedureName) {
+        return getProcedureWithServiceResponseAsync(accountName, databaseName, schemaName, procedureName).map(new Func1<ServiceResponse<USqlProcedure>, USqlProcedure>() {
+            @Override
+            public USqlProcedure call(ServiceResponse<USqlProcedure> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified procedure from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedure.
+     * @param schemaName The name of the schema containing the procedure.
+     * @param procedureName The name of the procedure.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlProcedure object
+     */
+    public Observable<ServiceResponse<USqlProcedure>> getProcedureWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String procedureName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (procedureName == null) {
+            throw new IllegalArgumentException("Parameter procedureName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getProcedure(databaseName, schemaName, procedureName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlProcedure>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlProcedure>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlProcedure> clientResponse = getProcedureDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlProcedure> getProcedureDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlProcedure, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlProcedure>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    public PagedList<USqlProcedure> listProcedures(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlProcedure>> response = listProceduresSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlProcedure>(response.body()) {
+            @Override
+            public Page<USqlProcedure> nextPage(String nextPageLink) {
+                return listProceduresNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @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<List<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlProcedure> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listProceduresSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(String nextPageLink) {
+                    return listProceduresNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<Page<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listProceduresWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlProcedure>>, Page<USqlProcedure>>() {
+                @Override
+                public Page<USqlProcedure> call(ServiceResponse<Page<USqlProcedure>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listProceduresSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlProcedure>>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(ServiceResponse<Page<USqlProcedure>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listProceduresNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlProcedure&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listProcedures(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlProcedure>> result = listProceduresDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlProcedure>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    public PagedList<USqlProcedure> listProcedures(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlProcedure>> response = listProceduresSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlProcedure>(response.body()) {
+            @Override
+            public Page<USqlProcedure> nextPage(String nextPageLink) {
+                return listProceduresNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlProcedure> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listProceduresSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(String nextPageLink) {
+                    return listProceduresNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<Page<USqlProcedure>> listProceduresAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listProceduresWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlProcedure>>, Page<USqlProcedure>>() {
+                @Override
+                public Page<USqlProcedure> call(ServiceResponse<Page<USqlProcedure>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the procedures.
+     * @param schemaName The name of the schema containing the procedures.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listProceduresSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlProcedure>>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(ServiceResponse<Page<USqlProcedure>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listProceduresNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlProcedure>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param databaseName The name of the database containing the procedures.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param schemaName The name of the schema containing the procedures.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlProcedure>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlProcedure&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listProcedures(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlProcedure>> result = listProceduresDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlProcedure>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlProcedure>> listProceduresDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlProcedure>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlProcedure>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @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 USqlTable object if successful.
+     */
+    public USqlTable getTable(String accountName, String databaseName, String schemaName, String tableName) {
+        return getTableWithServiceResponseAsync(accountName, databaseName, schemaName, tableName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @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<USqlTable> getTableAsync(String accountName, String databaseName, String schemaName, String tableName, final ServiceCallback<USqlTable> serviceCallback) {
+        return ServiceFuture.fromResponse(getTableWithServiceResponseAsync(accountName, databaseName, schemaName, tableName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTable object
+     */
+    public Observable<USqlTable> getTableAsync(String accountName, String databaseName, String schemaName, String tableName) {
+        return getTableWithServiceResponseAsync(accountName, databaseName, schemaName, tableName).map(new Func1<ServiceResponse<USqlTable>, USqlTable>() {
+            @Override
+            public USqlTable call(ServiceResponse<USqlTable> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified table from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table.
+     * @param schemaName The name of the schema containing the table.
+     * @param tableName The name of the table.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTable object
+     */
+    public Observable<ServiceResponse<USqlTable>> getTableWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getTable(databaseName, schemaName, tableName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlTable>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlTable>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlTable> clientResponse = getTableDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlTable> getTableDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlTable, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlTable>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    public PagedList<USqlTable> listTables(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlTable>> response = listTablesSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlTable>(response.body()) {
+            @Override
+            public Page<USqlTable> nextPage(String nextPageLink) {
+                return listTablesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @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<List<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTable> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablesSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(String nextPageLink) {
+                    return listTablesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<Page<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTablesWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlTable>>, Page<USqlTable>>() {
+                @Override
+                public Page<USqlTable> call(ServiceResponse<Page<USqlTable>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTablesSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTable>>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(ServiceResponse<Page<USqlTable>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTable&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTables(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTable>> result = listTablesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTable>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    public PagedList<USqlTable> listTables(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlTable>> response = listTablesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlTable>(response.body()) {
+            @Override
+            public Page<USqlTable> nextPage(String nextPageLink) {
+                return listTablesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTable> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(String nextPageLink) {
+                    return listTablesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<Page<USqlTable>> listTablesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTablesWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlTable>>, Page<USqlTable>>() {
+                @Override
+                public Page<USqlTable> call(ServiceResponse<Page<USqlTable>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the tables.
+     * @param schemaName The name of the schema containing the tables.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTablesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTable>>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(ServiceResponse<Page<USqlTable>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTable>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlTable>> * @param databaseName The name of the database containing the tables.
+    ServiceResponse<PageImpl<USqlTable>> * @param schemaName The name of the schema containing the tables.
+    ServiceResponse<PageImpl<USqlTable>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlTable>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTable&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTables(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTable>> result = listTablesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTable>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTable>> listTablesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTable>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTable>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @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 USqlTableType object if successful.
+     */
+    public USqlTableType getTableType(String accountName, String databaseName, String schemaName, String tableTypeName) {
+        return getTableTypeWithServiceResponseAsync(accountName, databaseName, schemaName, tableTypeName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @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<USqlTableType> getTableTypeAsync(String accountName, String databaseName, String schemaName, String tableTypeName, final ServiceCallback<USqlTableType> serviceCallback) {
+        return ServiceFuture.fromResponse(getTableTypeWithServiceResponseAsync(accountName, databaseName, schemaName, tableTypeName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableType object
+     */
+    public Observable<USqlTableType> getTableTypeAsync(String accountName, String databaseName, String schemaName, String tableTypeName) {
+        return getTableTypeWithServiceResponseAsync(accountName, databaseName, schemaName, tableTypeName).map(new Func1<ServiceResponse<USqlTableType>, USqlTableType>() {
+            @Override
+            public USqlTableType call(ServiceResponse<USqlTableType> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified table type from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table type.
+     * @param schemaName The name of the schema containing the table type.
+     * @param tableTypeName The name of the table type to retrieve.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableType object
+     */
+    public Observable<ServiceResponse<USqlTableType>> getTableTypeWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableTypeName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableTypeName == null) {
+            throw new IllegalArgumentException("Parameter tableTypeName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getTableType(databaseName, schemaName, tableTypeName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlTableType>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlTableType>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlTableType> clientResponse = getTableTypeDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlTableType> getTableTypeDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlTableType, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlTableType>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    public PagedList<USqlTableType> listTableTypes(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlTableType>> response = listTableTypesSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlTableType>(response.body()) {
+            @Override
+            public Page<USqlTableType> nextPage(String nextPageLink) {
+                return listTableTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @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<List<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTableType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableTypesSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(String nextPageLink) {
+                    return listTableTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<Page<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTableTypesWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlTableType>>, Page<USqlTableType>>() {
+                @Override
+                public Page<USqlTableType> call(ServiceResponse<Page<USqlTableType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTableTypesSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableType>>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(ServiceResponse<Page<USqlTableType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableTypes(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableType>> result = listTableTypesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    public PagedList<USqlTableType> listTableTypes(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlTableType>> response = listTableTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlTableType>(response.body()) {
+            @Override
+            public Page<USqlTableType> nextPage(String nextPageLink) {
+                return listTableTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(String nextPageLink) {
+                    return listTableTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<Page<USqlTableType>> listTableTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableTypesWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlTableType>>, Page<USqlTableType>>() {
+                @Override
+                public Page<USqlTableType> call(ServiceResponse<Page<USqlTableType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table types.
+     * @param schemaName The name of the schema containing the table types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableType>>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(ServiceResponse<Page<USqlTableType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableType>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlTableType>> * @param databaseName The name of the database containing the table types.
+    ServiceResponse<PageImpl<USqlTableType>> * @param schemaName The name of the schema containing the table types.
+    ServiceResponse<PageImpl<USqlTableType>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlTableType>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableTypes(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableType>> result = listTableTypesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableType>> listTableTypesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableType>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableType>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @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 USqlView object if successful.
+     */
+    public USqlView getView(String accountName, String databaseName, String schemaName, String viewName) {
+        return getViewWithServiceResponseAsync(accountName, databaseName, schemaName, viewName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @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<USqlView> getViewAsync(String accountName, String databaseName, String schemaName, String viewName, final ServiceCallback<USqlView> serviceCallback) {
+        return ServiceFuture.fromResponse(getViewWithServiceResponseAsync(accountName, databaseName, schemaName, viewName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlView object
+     */
+    public Observable<USqlView> getViewAsync(String accountName, String databaseName, String schemaName, String viewName) {
+        return getViewWithServiceResponseAsync(accountName, databaseName, schemaName, viewName).map(new Func1<ServiceResponse<USqlView>, USqlView>() {
+            @Override
+            public USqlView call(ServiceResponse<USqlView> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified view from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the view.
+     * @param schemaName The name of the schema containing the view.
+     * @param viewName The name of the view.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlView object
+     */
+    public Observable<ServiceResponse<USqlView>> getViewWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String viewName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (viewName == null) {
+            throw new IllegalArgumentException("Parameter viewName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getView(databaseName, schemaName, viewName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlView>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlView>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlView> clientResponse = getViewDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlView> getViewDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlView, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlView>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    public PagedList<USqlView> listViews(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlView>> response = listViewsSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlView>(response.body()) {
+            @Override
+            public Page<USqlView> nextPage(String nextPageLink) {
+                return listViewsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @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<List<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlView> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listViewsSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(String nextPageLink) {
+                    return listViewsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<Page<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listViewsWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlView>>, Page<USqlView>>() {
+                @Override
+                public Page<USqlView> call(ServiceResponse<Page<USqlView>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listViewsSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlView>>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(ServiceResponse<Page<USqlView>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listViewsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlView&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listViews(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlView>> result = listViewsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlView>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    public PagedList<USqlView> listViews(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlView>> response = listViewsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlView>(response.body()) {
+            @Override
+            public Page<USqlView> nextPage(String nextPageLink) {
+                return listViewsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlView> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listViewsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(String nextPageLink) {
+                    return listViewsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<Page<USqlView>> listViewsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listViewsWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlView>>, Page<USqlView>>() {
+                @Override
+                public Page<USqlView> call(ServiceResponse<Page<USqlView>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the views.
+     * @param schemaName The name of the schema containing the views.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listViewsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlView>>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(ServiceResponse<Page<USqlView>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listViewsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlView>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlView>> * @param databaseName The name of the database containing the views.
+    ServiceResponse<PageImpl<USqlView>> * @param schemaName The name of the schema containing the views.
+    ServiceResponse<PageImpl<USqlView>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlView>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlView&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listViews(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlView>> result = listViewsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlView>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlView>> listViewsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlView>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlView>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @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 USqlTableStatistics object if successful.
+     */
+    public USqlTableStatistics getTableStatistic(String accountName, String databaseName, String schemaName, String tableName, String statisticsName) {
+        return getTableStatisticWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, statisticsName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @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<USqlTableStatistics> getTableStatisticAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName, final ServiceCallback<USqlTableStatistics> serviceCallback) {
+        return ServiceFuture.fromResponse(getTableStatisticWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, statisticsName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableStatistics object
+     */
+    public Observable<USqlTableStatistics> getTableStatisticAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName) {
+        return getTableStatisticWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, statisticsName).map(new Func1<ServiceResponse<USqlTableStatistics>, USqlTableStatistics>() {
+            @Override
+            public USqlTableStatistics call(ServiceResponse<USqlTableStatistics> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param statisticsName The name of the table statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableStatistics object
+     */
+    public Observable<ServiceResponse<USqlTableStatistics>> getTableStatisticWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName, String statisticsName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (statisticsName == null) {
+            throw new IllegalArgumentException("Parameter statisticsName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getTableStatistic(databaseName, schemaName, tableName, statisticsName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlTableStatistics>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlTableStatistics>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlTableStatistics> clientResponse = getTableStatisticDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlTableStatistics> getTableStatisticDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlTableStatistics, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlTableStatistics>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    public PagedList<USqlTableStatistics> listTableStatistics(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        ServiceResponse<Page<USqlTableStatistics>> response = listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName).toBlocking().single();
+        return new PagedList<USqlTableStatistics>(response.body()) {
+            @Override
+            public Page<USqlTableStatistics> nextPage(String nextPageLink) {
+                return listTableStatisticsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @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<List<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final ListOperationCallback<USqlTableStatistics> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(String nextPageLink) {
+                    return listTableStatisticsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<Page<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        return listTableStatisticsWithServiceResponseAsync(accountName, databaseName, schemaName, tableName)
+            .map(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Page<USqlTableStatistics>>() {
+                @Override
+                public Page<USqlTableStatistics> call(ServiceResponse<Page<USqlTableStatistics>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        return listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(ServiceResponse<Page<USqlTableStatistics>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableStatisticsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableStatistics&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableStatistics(databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableStatistics>> result = listTableStatisticsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableStatistics>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    public PagedList<USqlTableStatistics> listTableStatistics(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlTableStatistics>> response = listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlTableStatistics>(response.body()) {
+            @Override
+            public Page<USqlTableStatistics> nextPage(String nextPageLink) {
+                return listTableStatisticsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableStatistics> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(String nextPageLink) {
+                    return listTableStatisticsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<Page<USqlTableStatistics>> listTableStatisticsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableStatisticsWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Page<USqlTableStatistics>>() {
+                @Override
+                public Page<USqlTableStatistics> call(ServiceResponse<Page<USqlTableStatistics>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the statistics.
+     * @param schemaName The name of the schema containing the statistics.
+     * @param tableName The name of the table containing the statistics.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableStatisticsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(ServiceResponse<Page<USqlTableStatistics>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableStatisticsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param databaseName The name of the database containing the statistics.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param schemaName The name of the schema containing the statistics.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param tableName The name of the table containing the statistics.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableStatistics&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableStatistics(databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableStatistics>> result = listTableStatisticsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableStatistics>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableStatistics>> listTableStatisticsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableStatistics>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableStatistics>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @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 USqlTablePartition object if successful.
+     */
+    public USqlTablePartition getTablePartition(String accountName, String databaseName, String schemaName, String tableName, String partitionName) {
+        return getTablePartitionWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, partitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @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<USqlTablePartition> getTablePartitionAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName, final ServiceCallback<USqlTablePartition> serviceCallback) {
+        return ServiceFuture.fromResponse(getTablePartitionWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, partitionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTablePartition object
+     */
+    public Observable<USqlTablePartition> getTablePartitionAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName) {
+        return getTablePartitionWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, partitionName).map(new Func1<ServiceResponse<USqlTablePartition>, USqlTablePartition>() {
+            @Override
+            public USqlTablePartition call(ServiceResponse<USqlTablePartition> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified table partition from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partition.
+     * @param schemaName The name of the schema containing the partition.
+     * @param tableName The name of the table containing the partition.
+     * @param partitionName The name of the table partition.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTablePartition object
+     */
+    public Observable<ServiceResponse<USqlTablePartition>> getTablePartitionWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableName, String partitionName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (partitionName == null) {
+            throw new IllegalArgumentException("Parameter partitionName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getTablePartition(databaseName, schemaName, tableName, partitionName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlTablePartition>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlTablePartition>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlTablePartition> clientResponse = getTablePartitionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlTablePartition> getTablePartitionDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlTablePartition, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlTablePartition>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    public PagedList<USqlTablePartition> listTablePartitions(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        ServiceResponse<Page<USqlTablePartition>> response = listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName).toBlocking().single();
+        return new PagedList<USqlTablePartition>(response.body()) {
+            @Override
+            public Page<USqlTablePartition> nextPage(String nextPageLink) {
+                return listTablePartitionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @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<List<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final ListOperationCallback<USqlTablePartition> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(String nextPageLink) {
+                    return listTablePartitionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<Page<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        return listTablePartitionsWithServiceResponseAsync(accountName, databaseName, schemaName, tableName)
+            .map(new Func1<ServiceResponse<Page<USqlTablePartition>>, Page<USqlTablePartition>>() {
+                @Override
+                public Page<USqlTablePartition> call(ServiceResponse<Page<USqlTablePartition>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        return listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTablePartition>>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(ServiceResponse<Page<USqlTablePartition>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablePartitionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTablePartition&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String tableName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTablePartitions(databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTablePartition>> result = listTablePartitionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTablePartition>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    public PagedList<USqlTablePartition> listTablePartitions(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlTablePartition>> response = listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlTablePartition>(response.body()) {
+            @Override
+            public Page<USqlTablePartition> nextPage(String nextPageLink) {
+                return listTablePartitionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTablePartition> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(String nextPageLink) {
+                    return listTablePartitionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<Page<USqlTablePartition>> listTablePartitionsAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTablePartitionsWithServiceResponseAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlTablePartition>>, Page<USqlTablePartition>>() {
+                @Override
+                public Page<USqlTablePartition> call(ServiceResponse<Page<USqlTablePartition>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the partitions.
+     * @param schemaName The name of the schema containing the partitions.
+     * @param tableName The name of the table containing the partitions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTablePartitionsSinglePageAsync(accountName, databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTablePartition>>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(ServiceResponse<Page<USqlTablePartition>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablePartitionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param databaseName The name of the database containing the partitions.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param schemaName The name of the schema containing the partitions.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param tableName The name of the table containing the partitions.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTablePartition&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String tableName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableName == null) {
+            throw new IllegalArgumentException("Parameter tableName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTablePartitions(databaseName, schemaName, tableName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTablePartition>> result = listTablePartitionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTablePartition>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTablePartition>> listTablePartitionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTablePartition>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTablePartition>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    public PagedList<USqlType> listTypes(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlType>> response = listTypesSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlType>(response.body()) {
+            @Override
+            public Page<USqlType> nextPage(String nextPageLink) {
+                return listTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @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<List<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTypesSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(String nextPageLink) {
+                    return listTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<Page<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTypesWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlType>>, Page<USqlType>>() {
+                @Override
+                public Page<USqlType> call(ServiceResponse<Page<USqlType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTypesSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlType>>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(ServiceResponse<Page<USqlType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTypes(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlType>> result = listTypesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    public PagedList<USqlType> listTypes(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlType>> response = listTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlType>(response.body()) {
+            @Override
+            public Page<USqlType> nextPage(String nextPageLink) {
+                return listTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(String nextPageLink) {
+                    return listTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<Page<USqlType>> listTypesAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTypesWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlType>>, Page<USqlType>>() {
+                @Override
+                public Page<USqlType> call(ServiceResponse<Page<USqlType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the types.
+     * @param schemaName The name of the schema containing the types.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTypesSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlType>>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(ServiceResponse<Page<USqlType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlType>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlType>> * @param databaseName The name of the database containing the types.
+    ServiceResponse<PageImpl<USqlType>> * @param schemaName The name of the schema containing the types.
+    ServiceResponse<PageImpl<USqlType>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlType>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTypes(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlType>> result = listTypesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlType>> listTypesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlType>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlType>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @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 USqlTableValuedFunction object if successful.
+     */
+    public USqlTableValuedFunction getTableValuedFunction(String accountName, String databaseName, String schemaName, String tableValuedFunctionName) {
+        return getTableValuedFunctionWithServiceResponseAsync(accountName, databaseName, schemaName, tableValuedFunctionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @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<USqlTableValuedFunction> getTableValuedFunctionAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName, final ServiceCallback<USqlTableValuedFunction> serviceCallback) {
+        return ServiceFuture.fromResponse(getTableValuedFunctionWithServiceResponseAsync(accountName, databaseName, schemaName, tableValuedFunctionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableValuedFunction object
+     */
+    public Observable<USqlTableValuedFunction> getTableValuedFunctionAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName) {
+        return getTableValuedFunctionWithServiceResponseAsync(accountName, databaseName, schemaName, tableValuedFunctionName).map(new Func1<ServiceResponse<USqlTableValuedFunction>, USqlTableValuedFunction>() {
+            @Override
+            public USqlTableValuedFunction call(ServiceResponse<USqlTableValuedFunction> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified table valued function from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued function.
+     * @param schemaName The name of the schema containing the table valued function.
+     * @param tableValuedFunctionName The name of the tableValuedFunction.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlTableValuedFunction object
+     */
+    public Observable<ServiceResponse<USqlTableValuedFunction>> getTableValuedFunctionWithServiceResponseAsync(String accountName, String databaseName, String schemaName, String tableValuedFunctionName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (tableValuedFunctionName == null) {
+            throw new IllegalArgumentException("Parameter tableValuedFunctionName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getTableValuedFunction(databaseName, schemaName, tableValuedFunctionName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlTableValuedFunction>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlTableValuedFunction>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlTableValuedFunction> clientResponse = getTableValuedFunctionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlTableValuedFunction> getTableValuedFunctionDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlTableValuedFunction, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlTableValuedFunction>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    public PagedList<USqlTableValuedFunction> listTableValuedFunctions(final String accountName, final String databaseName, final String schemaName) {
+        ServiceResponse<Page<USqlTableValuedFunction>> response = listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName).toBlocking().single();
+        return new PagedList<USqlTableValuedFunction>(response.body()) {
+            @Override
+            public Page<USqlTableValuedFunction> nextPage(String nextPageLink) {
+                return listTableValuedFunctionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @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<List<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final ListOperationCallback<USqlTableValuedFunction> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(String nextPageLink) {
+                    return listTableValuedFunctionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTableValuedFunctionsWithServiceResponseAsync(accountName, databaseName, schemaName)
+            .map(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Page<USqlTableValuedFunction>>() {
+                @Override
+                public Page<USqlTableValuedFunction> call(ServiceResponse<Page<USqlTableValuedFunction>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName) {
+        return listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(ServiceResponse<Page<USqlTableValuedFunction>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableValuedFunctionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableValuedFunction&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsSinglePageAsync(final String accountName, final String databaseName, final String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableValuedFunctions(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableValuedFunction>> result = listTableValuedFunctionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableValuedFunction>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    public PagedList<USqlTableValuedFunction> listTableValuedFunctions(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlTableValuedFunction>> response = listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlTableValuedFunction>(response.body()) {
+            @Override
+            public Page<USqlTableValuedFunction> nextPage(String nextPageLink) {
+                return listTableValuedFunctionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlTableValuedFunction> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(String nextPageLink) {
+                    return listTableValuedFunctionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableValuedFunctionsWithServiceResponseAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Page<USqlTableValuedFunction>>() {
+                @Override
+                public Page<USqlTableValuedFunction> call(ServiceResponse<Page<USqlTableValuedFunction>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the table valued functions.
+     * @param schemaName The name of the schema containing the table valued functions.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsWithServiceResponseAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listTableValuedFunctionsSinglePageAsync(accountName, databaseName, schemaName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(ServiceResponse<Page<USqlTableValuedFunction>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableValuedFunctionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param databaseName The name of the database containing the table valued functions.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param schemaName The name of the schema containing the table valued functions.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableValuedFunction&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsSinglePageAsync(final String accountName, final String databaseName, final String schemaName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listTableValuedFunctions(databaseName, schemaName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableValuedFunction>> result = listTableValuedFunctionsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableValuedFunction>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableValuedFunction>> listTableValuedFunctionsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableValuedFunction>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableValuedFunction>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @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 USqlAssembly object if successful.
+     */
+    public USqlAssembly getAssembly(String accountName, String databaseName, String assemblyName) {
+        return getAssemblyWithServiceResponseAsync(accountName, databaseName, assemblyName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @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<USqlAssembly> getAssemblyAsync(String accountName, String databaseName, String assemblyName, final ServiceCallback<USqlAssembly> serviceCallback) {
+        return ServiceFuture.fromResponse(getAssemblyWithServiceResponseAsync(accountName, databaseName, assemblyName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlAssembly object
+     */
+    public Observable<USqlAssembly> getAssemblyAsync(String accountName, String databaseName, String assemblyName) {
+        return getAssemblyWithServiceResponseAsync(accountName, databaseName, assemblyName).map(new Func1<ServiceResponse<USqlAssembly>, USqlAssembly>() {
+            @Override
+            public USqlAssembly call(ServiceResponse<USqlAssembly> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified assembly from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param assemblyName The name of the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlAssembly object
+     */
+    public Observable<ServiceResponse<USqlAssembly>> getAssemblyWithServiceResponseAsync(String accountName, String databaseName, String assemblyName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (assemblyName == null) {
+            throw new IllegalArgumentException("Parameter assemblyName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getAssembly(databaseName, assemblyName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlAssembly>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlAssembly>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlAssembly> clientResponse = getAssemblyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlAssembly> getAssemblyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlAssembly, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlAssembly>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    public PagedList<USqlAssemblyClr> listAssemblies(final String accountName, final String databaseName) {
+        ServiceResponse<Page<USqlAssemblyClr>> response = listAssembliesSinglePageAsync(accountName, databaseName).toBlocking().single();
+        return new PagedList<USqlAssemblyClr>(response.body()) {
+            @Override
+            public Page<USqlAssemblyClr> nextPage(String nextPageLink) {
+                return listAssembliesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @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<List<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlAssemblyClr> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAssembliesSinglePageAsync(accountName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(String nextPageLink) {
+                    return listAssembliesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<Page<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName) {
+        return listAssembliesWithServiceResponseAsync(accountName, databaseName)
+            .map(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Page<USqlAssemblyClr>>() {
+                @Override
+                public Page<USqlAssemblyClr> call(ServiceResponse<Page<USqlAssemblyClr>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesWithServiceResponseAsync(final String accountName, final String databaseName) {
+        return listAssembliesSinglePageAsync(accountName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(ServiceResponse<Page<USqlAssemblyClr>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAssembliesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlAssemblyClr&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesSinglePageAsync(final String accountName, final String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listAssemblies(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlAssemblyClr>> result = listAssembliesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlAssemblyClr>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    public PagedList<USqlAssemblyClr> listAssemblies(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlAssemblyClr>> response = listAssembliesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlAssemblyClr>(response.body()) {
+            @Override
+            public Page<USqlAssemblyClr> nextPage(String nextPageLink) {
+                return listAssembliesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlAssemblyClr> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAssembliesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(String nextPageLink) {
+                    return listAssembliesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<Page<USqlAssemblyClr>> listAssembliesAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listAssembliesWithServiceResponseAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Page<USqlAssemblyClr>>() {
+                @Override
+                public Page<USqlAssemblyClr> call(ServiceResponse<Page<USqlAssemblyClr>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the assembly.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listAssembliesSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(ServiceResponse<Page<USqlAssemblyClr>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAssembliesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param databaseName The name of the database containing the assembly.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlAssemblyClr&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesSinglePageAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listAssemblies(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlAssemblyClr>> result = listAssembliesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlAssemblyClr>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlAssemblyClr>> listAssembliesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlAssemblyClr>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlAssemblyClr>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @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 USqlSchema object if successful.
+     */
+    public USqlSchema getSchema(String accountName, String databaseName, String schemaName) {
+        return getSchemaWithServiceResponseAsync(accountName, databaseName, schemaName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @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<USqlSchema> getSchemaAsync(String accountName, String databaseName, String schemaName, final ServiceCallback<USqlSchema> serviceCallback) {
+        return ServiceFuture.fromResponse(getSchemaWithServiceResponseAsync(accountName, databaseName, schemaName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSchema object
+     */
+    public Observable<USqlSchema> getSchemaAsync(String accountName, String databaseName, String schemaName) {
+        return getSchemaWithServiceResponseAsync(accountName, databaseName, schemaName).map(new Func1<ServiceResponse<USqlSchema>, USqlSchema>() {
+            @Override
+            public USqlSchema call(ServiceResponse<USqlSchema> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified schema from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param schemaName The name of the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlSchema object
+     */
+    public Observable<ServiceResponse<USqlSchema>> getSchemaWithServiceResponseAsync(String accountName, String databaseName, String schemaName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (schemaName == null) {
+            throw new IllegalArgumentException("Parameter schemaName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getSchema(databaseName, schemaName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlSchema>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlSchema>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlSchema> clientResponse = getSchemaDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlSchema> getSchemaDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlSchema, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlSchema>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    public PagedList<USqlSchema> listSchemas(final String accountName, final String databaseName) {
+        ServiceResponse<Page<USqlSchema>> response = listSchemasSinglePageAsync(accountName, databaseName).toBlocking().single();
+        return new PagedList<USqlSchema>(response.body()) {
+            @Override
+            public Page<USqlSchema> nextPage(String nextPageLink) {
+                return listSchemasNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @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<List<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final ListOperationCallback<USqlSchema> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSchemasSinglePageAsync(accountName, databaseName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(String nextPageLink) {
+                    return listSchemasNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<Page<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName) {
+        return listSchemasWithServiceResponseAsync(accountName, databaseName)
+            .map(new Func1<ServiceResponse<Page<USqlSchema>>, Page<USqlSchema>>() {
+                @Override
+                public Page<USqlSchema> call(ServiceResponse<Page<USqlSchema>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasWithServiceResponseAsync(final String accountName, final String databaseName) {
+        return listSchemasSinglePageAsync(accountName, databaseName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlSchema>>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(ServiceResponse<Page<USqlSchema>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSchemasNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlSchema&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasSinglePageAsync(final String accountName, final String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listSchemas(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlSchema>> result = listSchemasDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlSchema>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    public PagedList<USqlSchema> listSchemas(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlSchema>> response = listSchemasSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlSchema>(response.body()) {
+            @Override
+            public Page<USqlSchema> nextPage(String nextPageLink) {
+                return listSchemasNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlSchema> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSchemasSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(String nextPageLink) {
+                    return listSchemasNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<Page<USqlSchema>> listSchemasAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listSchemasWithServiceResponseAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlSchema>>, Page<USqlSchema>>() {
+                @Override
+                public Page<USqlSchema> call(ServiceResponse<Page<USqlSchema>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database containing the schema.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasWithServiceResponseAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listSchemasSinglePageAsync(accountName, databaseName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlSchema>>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(ServiceResponse<Page<USqlSchema>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSchemasNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlSchema>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlSchema>> * @param databaseName The name of the database containing the schema.
+    ServiceResponse<PageImpl<USqlSchema>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlSchema>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlSchema&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasSinglePageAsync(final String accountName, final String databaseName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listSchemas(databaseName, filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlSchema>> result = listSchemasDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlSchema>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlSchema>> listSchemasDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlSchema>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlSchema>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @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 USqlDatabase object if successful.
+     */
+    public USqlDatabase getDatabase(String accountName, String databaseName) {
+        return getDatabaseWithServiceResponseAsync(accountName, databaseName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @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<USqlDatabase> getDatabaseAsync(String accountName, String databaseName, final ServiceCallback<USqlDatabase> serviceCallback) {
+        return ServiceFuture.fromResponse(getDatabaseWithServiceResponseAsync(accountName, databaseName), serviceCallback);
+    }
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlDatabase object
+     */
+    public Observable<USqlDatabase> getDatabaseAsync(String accountName, String databaseName) {
+        return getDatabaseWithServiceResponseAsync(accountName, databaseName).map(new Func1<ServiceResponse<USqlDatabase>, USqlDatabase>() {
+            @Override
+            public USqlDatabase call(ServiceResponse<USqlDatabase> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the specified database from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the USqlDatabase object
+     */
+    public Observable<ServiceResponse<USqlDatabase>> getDatabaseWithServiceResponseAsync(String accountName, String databaseName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (databaseName == null) {
+            throw new IllegalArgumentException("Parameter databaseName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.getDatabase(databaseName, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<USqlDatabase>>>() {
+                @Override
+                public Observable<ServiceResponse<USqlDatabase>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<USqlDatabase> clientResponse = getDatabaseDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<USqlDatabase> getDatabaseDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<USqlDatabase, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<USqlDatabase>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    public PagedList<USqlDatabase> listDatabases(final String accountName) {
+        ServiceResponse<Page<USqlDatabase>> response = listDatabasesSinglePageAsync(accountName).toBlocking().single();
+        return new PagedList<USqlDatabase>(response.body()) {
+            @Override
+            public Page<USqlDatabase> nextPage(String nextPageLink) {
+                return listDatabasesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @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<List<USqlDatabase>> listDatabasesAsync(final String accountName, final ListOperationCallback<USqlDatabase> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listDatabasesSinglePageAsync(accountName),
+            new Func1<String, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(String nextPageLink) {
+                    return listDatabasesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<Page<USqlDatabase>> listDatabasesAsync(final String accountName) {
+        return listDatabasesWithServiceResponseAsync(accountName)
+            .map(new Func1<ServiceResponse<Page<USqlDatabase>>, Page<USqlDatabase>>() {
+                @Override
+                public Page<USqlDatabase> call(ServiceResponse<Page<USqlDatabase>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesWithServiceResponseAsync(final String accountName) {
+        return listDatabasesSinglePageAsync(accountName)
+            .concatMap(new Func1<ServiceResponse<Page<USqlDatabase>>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(ServiceResponse<Page<USqlDatabase>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listDatabasesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlDatabase&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesSinglePageAsync(final String accountName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listDatabases(filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlDatabase>> result = listDatabasesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlDatabase>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    public PagedList<USqlDatabase> listDatabases(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        ServiceResponse<Page<USqlDatabase>> response = listDatabasesSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count).toBlocking().single();
+        return new PagedList<USqlDatabase>(response.body()) {
+            @Override
+            public Page<USqlDatabase> nextPage(String nextPageLink) {
+                return listDatabasesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @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<List<USqlDatabase>> listDatabasesAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final ListOperationCallback<USqlDatabase> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listDatabasesSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count),
+            new Func1<String, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(String nextPageLink) {
+                    return listDatabasesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<Page<USqlDatabase>> listDatabasesAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listDatabasesWithServiceResponseAsync(accountName, filter, top, skip, expand, select, orderby, count)
+            .map(new Func1<ServiceResponse<Page<USqlDatabase>>, Page<USqlDatabase>>() {
+                @Override
+                public Page<USqlDatabase> call(ServiceResponse<Page<USqlDatabase>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesWithServiceResponseAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        return listDatabasesSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count)
+            .concatMap(new Func1<ServiceResponse<Page<USqlDatabase>>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(ServiceResponse<Page<USqlDatabase>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listDatabasesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlDatabase>> * @param accountName The Azure Data Lake Analytics account to execute catalog operations on.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories?$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<USqlDatabase>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlDatabase&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesSinglePageAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaCatalogDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaCatalogDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaCatalogDnsSuffix}", this.client.adlaCatalogDnsSuffix());
+        return service.listDatabases(filter, top, skip, expand, select, orderby, count, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlDatabase>> result = listDatabasesDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlDatabase>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlDatabase>> listDatabasesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlDatabase>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlDatabase>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlExternalDataSource&gt; object if successful.
+     */
+    public PagedList<USqlExternalDataSource> listExternalDataSourcesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlExternalDataSource>> response = listExternalDataSourcesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlExternalDataSource>(response.body()) {
+            @Override
+            public Page<USqlExternalDataSource> nextPage(String nextPageLink) {
+                return listExternalDataSourcesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlExternalDataSource>> listExternalDataSourcesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlExternalDataSource>> serviceFuture, final ListOperationCallback<USqlExternalDataSource> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listExternalDataSourcesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(String nextPageLink) {
+                    return listExternalDataSourcesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<Page<USqlExternalDataSource>> listExternalDataSourcesNextAsync(final String nextPageLink) {
+        return listExternalDataSourcesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Page<USqlExternalDataSource>>() {
+                @Override
+                public Page<USqlExternalDataSource> call(ServiceResponse<Page<USqlExternalDataSource>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlExternalDataSource&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listExternalDataSourcesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlExternalDataSource>>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(ServiceResponse<Page<USqlExternalDataSource>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listExternalDataSourcesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of external data sources from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlExternalDataSource>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlExternalDataSource&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlExternalDataSource>>> listExternalDataSourcesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listExternalDataSourcesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlExternalDataSource>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlExternalDataSource>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlExternalDataSource>> result = listExternalDataSourcesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlExternalDataSource>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlExternalDataSource>> listExternalDataSourcesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlExternalDataSource>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlExternalDataSource>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlCredential&gt; object if successful.
+     */
+    public PagedList<USqlCredential> listCredentialsNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlCredential>> response = listCredentialsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlCredential>(response.body()) {
+            @Override
+            public Page<USqlCredential> nextPage(String nextPageLink) {
+                return listCredentialsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlCredential>> listCredentialsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlCredential>> serviceFuture, final ListOperationCallback<USqlCredential> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listCredentialsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(String nextPageLink) {
+                    return listCredentialsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<Page<USqlCredential>> listCredentialsNextAsync(final String nextPageLink) {
+        return listCredentialsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlCredential>>, Page<USqlCredential>>() {
+                @Override
+                public Page<USqlCredential> call(ServiceResponse<Page<USqlCredential>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlCredential&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listCredentialsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlCredential>>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(ServiceResponse<Page<USqlCredential>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listCredentialsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of credentials from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlCredential>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlCredential&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlCredential>>> listCredentialsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listCredentialsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlCredential>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlCredential>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlCredential>> result = listCredentialsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlCredential>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlCredential>> listCredentialsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlCredential>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlCredential>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlProcedure&gt; object if successful.
+     */
+    public PagedList<USqlProcedure> listProceduresNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlProcedure>> response = listProceduresNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlProcedure>(response.body()) {
+            @Override
+            public Page<USqlProcedure> nextPage(String nextPageLink) {
+                return listProceduresNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlProcedure>> listProceduresNextAsync(final String nextPageLink, final ServiceFuture<List<USqlProcedure>> serviceFuture, final ListOperationCallback<USqlProcedure> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listProceduresNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(String nextPageLink) {
+                    return listProceduresNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<Page<USqlProcedure>> listProceduresNextAsync(final String nextPageLink) {
+        return listProceduresNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlProcedure>>, Page<USqlProcedure>>() {
+                @Override
+                public Page<USqlProcedure> call(ServiceResponse<Page<USqlProcedure>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlProcedure&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresNextWithServiceResponseAsync(final String nextPageLink) {
+        return listProceduresNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlProcedure>>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(ServiceResponse<Page<USqlProcedure>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listProceduresNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of procedures from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlProcedure>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlProcedure&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlProcedure>>> listProceduresNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listProceduresNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlProcedure>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlProcedure>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlProcedure>> result = listProceduresNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlProcedure>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlProcedure>> listProceduresNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlProcedure>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlProcedure>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTable&gt; object if successful.
+     */
+    public PagedList<USqlTable> listTablesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlTable>> response = listTablesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlTable>(response.body()) {
+            @Override
+            public Page<USqlTable> nextPage(String nextPageLink) {
+                return listTablesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlTable>> listTablesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTable>> serviceFuture, final ListOperationCallback<USqlTable> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(String nextPageLink) {
+                    return listTablesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<Page<USqlTable>> listTablesNextAsync(final String nextPageLink) {
+        return listTablesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlTable>>, Page<USqlTable>>() {
+                @Override
+                public Page<USqlTable> call(ServiceResponse<Page<USqlTable>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTable&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTablesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTable>>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(ServiceResponse<Page<USqlTable>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of tables from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTable>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTable&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTable>>> listTablesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTablesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTable>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTable>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTable>> result = listTablesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTable>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTable>> listTablesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTable>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTable>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableType&gt; object if successful.
+     */
+    public PagedList<USqlTableType> listTableTypesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlTableType>> response = listTableTypesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlTableType>(response.body()) {
+            @Override
+            public Page<USqlTableType> nextPage(String nextPageLink) {
+                return listTableTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlTableType>> listTableTypesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableType>> serviceFuture, final ListOperationCallback<USqlTableType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableTypesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(String nextPageLink) {
+                    return listTableTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<Page<USqlTableType>> listTableTypesNextAsync(final String nextPageLink) {
+        return listTableTypesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlTableType>>, Page<USqlTableType>>() {
+                @Override
+                public Page<USqlTableType> call(ServiceResponse<Page<USqlTableType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTableTypesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableType>>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(ServiceResponse<Page<USqlTableType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table types from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableType>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableType>>> listTableTypesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTableTypesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableType>> result = listTableTypesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableType>> listTableTypesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableType>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableType>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlView&gt; object if successful.
+     */
+    public PagedList<USqlView> listViewsNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlView>> response = listViewsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlView>(response.body()) {
+            @Override
+            public Page<USqlView> nextPage(String nextPageLink) {
+                return listViewsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlView>> listViewsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlView>> serviceFuture, final ListOperationCallback<USqlView> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listViewsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(String nextPageLink) {
+                    return listViewsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<Page<USqlView>> listViewsNextAsync(final String nextPageLink) {
+        return listViewsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlView>>, Page<USqlView>>() {
+                @Override
+                public Page<USqlView> call(ServiceResponse<Page<USqlView>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlView&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listViewsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlView>>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(ServiceResponse<Page<USqlView>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listViewsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of views from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlView>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlView&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlView>>> listViewsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listViewsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlView>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlView>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlView>> result = listViewsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlView>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlView>> listViewsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlView>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlView>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableStatistics&gt; object if successful.
+     */
+    public PagedList<USqlTableStatistics> listTableStatisticsNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlTableStatistics>> response = listTableStatisticsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlTableStatistics>(response.body()) {
+            @Override
+            public Page<USqlTableStatistics> nextPage(String nextPageLink) {
+                return listTableStatisticsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlTableStatistics>> listTableStatisticsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableStatistics>> serviceFuture, final ListOperationCallback<USqlTableStatistics> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableStatisticsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(String nextPageLink) {
+                    return listTableStatisticsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<Page<USqlTableStatistics>> listTableStatisticsNextAsync(final String nextPageLink) {
+        return listTableStatisticsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Page<USqlTableStatistics>>() {
+                @Override
+                public Page<USqlTableStatistics> call(ServiceResponse<Page<USqlTableStatistics>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableStatistics&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTableStatisticsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableStatistics>>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(ServiceResponse<Page<USqlTableStatistics>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableStatisticsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table statistics from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableStatistics>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableStatistics&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableStatistics>>> listTableStatisticsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTableStatisticsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableStatistics>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableStatistics>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableStatistics>> result = listTableStatisticsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableStatistics>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableStatistics>> listTableStatisticsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableStatistics>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableStatistics>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTablePartition&gt; object if successful.
+     */
+    public PagedList<USqlTablePartition> listTablePartitionsNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlTablePartition>> response = listTablePartitionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlTablePartition>(response.body()) {
+            @Override
+            public Page<USqlTablePartition> nextPage(String nextPageLink) {
+                return listTablePartitionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlTablePartition>> listTablePartitionsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTablePartition>> serviceFuture, final ListOperationCallback<USqlTablePartition> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTablePartitionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(String nextPageLink) {
+                    return listTablePartitionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<Page<USqlTablePartition>> listTablePartitionsNextAsync(final String nextPageLink) {
+        return listTablePartitionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlTablePartition>>, Page<USqlTablePartition>>() {
+                @Override
+                public Page<USqlTablePartition> call(ServiceResponse<Page<USqlTablePartition>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTablePartition&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTablePartitionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTablePartition>>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(ServiceResponse<Page<USqlTablePartition>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTablePartitionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table partitions from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTablePartition>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTablePartition&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTablePartition>>> listTablePartitionsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTablePartitionsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTablePartition>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTablePartition>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTablePartition>> result = listTablePartitionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTablePartition>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTablePartition>> listTablePartitionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTablePartition>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTablePartition>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlType&gt; object if successful.
+     */
+    public PagedList<USqlType> listTypesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlType>> response = listTypesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlType>(response.body()) {
+            @Override
+            public Page<USqlType> nextPage(String nextPageLink) {
+                return listTypesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlType>> listTypesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlType>> serviceFuture, final ListOperationCallback<USqlType> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTypesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(String nextPageLink) {
+                    return listTypesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<Page<USqlType>> listTypesNextAsync(final String nextPageLink) {
+        return listTypesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlType>>, Page<USqlType>>() {
+                @Override
+                public Page<USqlType> call(ServiceResponse<Page<USqlType>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlType&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTypesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlType>>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(ServiceResponse<Page<USqlType>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTypesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of types within the specified database and schema from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlType>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlType&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlType>>> listTypesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTypesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlType>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlType>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlType>> result = listTypesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlType>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlType>> listTypesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlType>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlType>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlTableValuedFunction&gt; object if successful.
+     */
+    public PagedList<USqlTableValuedFunction> listTableValuedFunctionsNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlTableValuedFunction>> response = listTableValuedFunctionsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlTableValuedFunction>(response.body()) {
+            @Override
+            public Page<USqlTableValuedFunction> nextPage(String nextPageLink) {
+                return listTableValuedFunctionsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlTableValuedFunction>> listTableValuedFunctionsNextAsync(final String nextPageLink, final ServiceFuture<List<USqlTableValuedFunction>> serviceFuture, final ListOperationCallback<USqlTableValuedFunction> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listTableValuedFunctionsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(String nextPageLink) {
+                    return listTableValuedFunctionsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<Page<USqlTableValuedFunction>> listTableValuedFunctionsNextAsync(final String nextPageLink) {
+        return listTableValuedFunctionsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Page<USqlTableValuedFunction>>() {
+                @Override
+                public Page<USqlTableValuedFunction> call(ServiceResponse<Page<USqlTableValuedFunction>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlTableValuedFunction&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listTableValuedFunctionsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlTableValuedFunction>>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(ServiceResponse<Page<USqlTableValuedFunction>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listTableValuedFunctionsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of table valued functions from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlTableValuedFunction>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlTableValuedFunction&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> listTableValuedFunctionsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listTableValuedFunctionsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlTableValuedFunction>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlTableValuedFunction>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlTableValuedFunction>> result = listTableValuedFunctionsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlTableValuedFunction>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlTableValuedFunction>> listTableValuedFunctionsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlTableValuedFunction>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlTableValuedFunction>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlAssemblyClr&gt; object if successful.
+     */
+    public PagedList<USqlAssemblyClr> listAssembliesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlAssemblyClr>> response = listAssembliesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlAssemblyClr>(response.body()) {
+            @Override
+            public Page<USqlAssemblyClr> nextPage(String nextPageLink) {
+                return listAssembliesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlAssemblyClr>> listAssembliesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlAssemblyClr>> serviceFuture, final ListOperationCallback<USqlAssemblyClr> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listAssembliesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(String nextPageLink) {
+                    return listAssembliesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<Page<USqlAssemblyClr>> listAssembliesNextAsync(final String nextPageLink) {
+        return listAssembliesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Page<USqlAssemblyClr>>() {
+                @Override
+                public Page<USqlAssemblyClr> call(ServiceResponse<Page<USqlAssemblyClr>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlAssemblyClr&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listAssembliesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlAssemblyClr>>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(ServiceResponse<Page<USqlAssemblyClr>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listAssembliesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of assemblies from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlAssemblyClr>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlAssemblyClr&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlAssemblyClr>>> listAssembliesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listAssembliesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlAssemblyClr>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlAssemblyClr>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlAssemblyClr>> result = listAssembliesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlAssemblyClr>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlAssemblyClr>> listAssembliesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlAssemblyClr>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlAssemblyClr>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlSchema&gt; object if successful.
+     */
+    public PagedList<USqlSchema> listSchemasNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlSchema>> response = listSchemasNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlSchema>(response.body()) {
+            @Override
+            public Page<USqlSchema> nextPage(String nextPageLink) {
+                return listSchemasNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlSchema>> listSchemasNextAsync(final String nextPageLink, final ServiceFuture<List<USqlSchema>> serviceFuture, final ListOperationCallback<USqlSchema> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSchemasNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(String nextPageLink) {
+                    return listSchemasNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<Page<USqlSchema>> listSchemasNextAsync(final String nextPageLink) {
+        return listSchemasNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlSchema>>, Page<USqlSchema>>() {
+                @Override
+                public Page<USqlSchema> call(ServiceResponse<Page<USqlSchema>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlSchema&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasNextWithServiceResponseAsync(final String nextPageLink) {
+        return listSchemasNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlSchema>>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(ServiceResponse<Page<USqlSchema>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listSchemasNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of schemas from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlSchema>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlSchema&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlSchema>>> listSchemasNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listSchemasNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlSchema>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlSchema>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlSchema>> result = listSchemasNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlSchema>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlSchema>> listSchemasNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlSchema>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlSchema>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;USqlDatabase&gt; object if successful.
+     */
+    public PagedList<USqlDatabase> listDatabasesNext(final String nextPageLink) {
+        ServiceResponse<Page<USqlDatabase>> response = listDatabasesNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<USqlDatabase>(response.body()) {
+            @Override
+            public Page<USqlDatabase> nextPage(String nextPageLink) {
+                return listDatabasesNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<USqlDatabase>> listDatabasesNextAsync(final String nextPageLink, final ServiceFuture<List<USqlDatabase>> serviceFuture, final ListOperationCallback<USqlDatabase> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listDatabasesNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(String nextPageLink) {
+                    return listDatabasesNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<Page<USqlDatabase>> listDatabasesNextAsync(final String nextPageLink) {
+        return listDatabasesNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<USqlDatabase>>, Page<USqlDatabase>>() {
+                @Override
+                public Page<USqlDatabase> call(ServiceResponse<Page<USqlDatabase>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;USqlDatabase&gt; object
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesNextWithServiceResponseAsync(final String nextPageLink) {
+        return listDatabasesNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<USqlDatabase>>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(ServiceResponse<Page<USqlDatabase>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listDatabasesNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the list of databases from the Data Lake Analytics catalog.
+     *
+    ServiceResponse<PageImpl<USqlDatabase>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;USqlDatabase&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<USqlDatabase>>> listDatabasesNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listDatabasesNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<USqlDatabase>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<USqlDatabase>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<USqlDatabase>> result = listDatabasesNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<USqlDatabase>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<USqlDatabase>> listDatabasesNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<USqlDatabase>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<USqlDatabase>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java
new file mode 100644
index 000000000000..c2e4a2ddb6fe
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsCatalogManagementClientImpl.java
@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.datalake.analytics.Catalogs;
+import com.microsoft.azure.datalake.analytics.DataLakeAnalyticsCatalogManagementClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the DataLakeAnalyticsCatalogManagementClientImpl class.
+ */
+public class DataLakeAnalyticsCatalogManagementClientImpl extends AzureServiceClient implements DataLakeAnalyticsCatalogManagementClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Client Api Version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client Api Version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets the DNS suffix used as the base for all Azure Data Lake Analytics Catalog service requests. */
+    private String adlaCatalogDnsSuffix;
+
+    /**
+     * Gets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Catalog service requests.
+     *
+     * @return the adlaCatalogDnsSuffix value.
+     */
+    public String adlaCatalogDnsSuffix() {
+        return this.adlaCatalogDnsSuffix;
+    }
+
+    /**
+     * Sets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Catalog service requests.
+     *
+     * @param adlaCatalogDnsSuffix the adlaCatalogDnsSuffix value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl withAdlaCatalogDnsSuffix(String adlaCatalogDnsSuffix) {
+        this.adlaCatalogDnsSuffix = adlaCatalogDnsSuffix;
+        return this;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The Catalogs object to access its operations.
+     */
+    private Catalogs catalogs;
+
+    /**
+     * Gets the Catalogs object to access its operations.
+     * @return the Catalogs object.
+     */
+    public Catalogs catalogs() {
+        return this.catalogs;
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsCatalogManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://{accountName}.{adlaCatalogDnsSuffix}", credentials);
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsCatalogManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    private DataLakeAnalyticsCatalogManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsCatalogManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public DataLakeAnalyticsCatalogManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2015-10-01-preview";
+        this.adlaCatalogDnsSuffix = "azuredatalakeanalytics.net";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.catalogs = new CatalogsImpl(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "DataLakeAnalyticsCatalogManagementClient", "2015-10-01-preview");
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java
new file mode 100644
index 000000000000..677dae2b082c
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/DataLakeAnalyticsJobManagementClientImpl.java
@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.datalake.analytics.DataLakeAnalyticsJobManagementClient;
+import com.microsoft.azure.datalake.analytics.Jobs;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the DataLakeAnalyticsJobManagementClientImpl class.
+ */
+public class DataLakeAnalyticsJobManagementClientImpl extends AzureServiceClient implements DataLakeAnalyticsJobManagementClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Client Api Version. */
+    private String apiVersion;
+
+    /**
+     * Gets Client Api Version.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests. */
+    private String adlaJobDnsSuffix;
+
+    /**
+     * Gets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests.
+     *
+     * @return the adlaJobDnsSuffix value.
+     */
+    public String adlaJobDnsSuffix() {
+        return this.adlaJobDnsSuffix;
+    }
+
+    /**
+     * Sets Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests.
+     *
+     * @param adlaJobDnsSuffix the adlaJobDnsSuffix value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsJobManagementClientImpl withAdlaJobDnsSuffix(String adlaJobDnsSuffix) {
+        this.adlaJobDnsSuffix = adlaJobDnsSuffix;
+        return this;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsJobManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsJobManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public DataLakeAnalyticsJobManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The Jobs object to access its operations.
+     */
+    private Jobs jobs;
+
+    /**
+     * Gets the Jobs object to access its operations.
+     * @return the Jobs object.
+     */
+    public Jobs jobs() {
+        return this.jobs;
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsJobManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public DataLakeAnalyticsJobManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://{accountName}.{adlaJobDnsSuffix}", credentials);
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsJobManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    private DataLakeAnalyticsJobManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of DataLakeAnalyticsJobManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public DataLakeAnalyticsJobManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2015-11-01-preview";
+        this.adlaJobDnsSuffix = "azuredatalakeanalytics.net";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.jobs = new JobsImpl(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "DataLakeAnalyticsJobManagementClient", "2015-11-01-preview");
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/JobsImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/JobsImpl.java
new file mode 100644
index 000000000000..59adf78b1ec6
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/JobsImpl.java
@@ -0,0 +1,1025 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import retrofit2.Retrofit;
+import com.microsoft.azure.datalake.analytics.Jobs;
+import com.google.common.base.Joiner;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobDataPath;
+import com.microsoft.azure.datalake.analytics.models.JobInformation;
+import com.microsoft.azure.datalake.analytics.models.JobStatistics;
+import com.microsoft.azure.datalake.analytics.models.PageImpl;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Jobs.
+ */
+public class JobsImpl implements Jobs {
+    /** The Retrofit service to perform REST calls. */
+    private JobsService service;
+    /** The service client containing this operation class. */
+    private DataLakeAnalyticsJobManagementClientImpl client;
+
+    /**
+     * Initializes an instance of JobsImpl.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public JobsImpl(Retrofit retrofit, DataLakeAnalyticsJobManagementClientImpl client) {
+        this.service = retrofit.create(JobsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Jobs to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface JobsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs getStatistics" })
+        @POST("Jobs/{jobIdentity}/GetStatistics")
+        Observable<Response<ResponseBody>> getStatistics(@Path("jobIdentity") UUID jobIdentity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs getDebugDataPath" })
+        @POST("Jobs/{jobIdentity}/GetDebugDataPath")
+        Observable<Response<ResponseBody>> getDebugDataPath(@Path("jobIdentity") UUID jobIdentity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs build" })
+        @POST("BuildJob")
+        Observable<Response<ResponseBody>> build(@Body JobInformation parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs cancel" })
+        @POST("Jobs/{jobIdentity}/CancelJob")
+        Observable<Response<ResponseBody>> cancel(@Path("jobIdentity") UUID jobIdentity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs get" })
+        @GET("Jobs/{jobIdentity}")
+        Observable<Response<ResponseBody>> get(@Path("jobIdentity") UUID jobIdentity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs create" })
+        @PUT("Jobs/{jobIdentity}")
+        Observable<Response<ResponseBody>> create(@Path("jobIdentity") UUID jobIdentity, @Body JobInformation parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs list" })
+        @GET("Jobs")
+        Observable<Response<ResponseBody>> list(@Query("$filter") String filter, @Query("$top") Integer top, @Query("$skip") Integer skip, @Query("$expand") String expand, @Query("$select") String select, @Query("$orderby") String orderby, @Query("$count") Boolean count, @Query("$search") String search, @Query("$format") String format, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Jobs listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobStatistics object if successful.
+     */
+    public JobStatistics getStatistics(String accountName, UUID jobIdentity) {
+        return getStatisticsWithServiceResponseAsync(accountName, jobIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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<JobStatistics> getStatisticsAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobStatistics> serviceCallback) {
+        return ServiceFuture.fromResponse(getStatisticsWithServiceResponseAsync(accountName, jobIdentity), serviceCallback);
+    }
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobStatistics object
+     */
+    public Observable<JobStatistics> getStatisticsAsync(String accountName, UUID jobIdentity) {
+        return getStatisticsWithServiceResponseAsync(accountName, jobIdentity).map(new Func1<ServiceResponse<JobStatistics>, JobStatistics>() {
+            @Override
+            public JobStatistics call(ServiceResponse<JobStatistics> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets statistics of the specified job.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobStatistics object
+     */
+    public Observable<ServiceResponse<JobStatistics>> getStatisticsWithServiceResponseAsync(String accountName, UUID jobIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (jobIdentity == null) {
+            throw new IllegalArgumentException("Parameter jobIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.getStatistics(jobIdentity, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobStatistics>>>() {
+                @Override
+                public Observable<ServiceResponse<JobStatistics>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobStatistics> clientResponse = getStatisticsDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobStatistics> getStatisticsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobStatistics, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobStatistics>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobDataPath object if successful.
+     */
+    public JobDataPath getDebugDataPath(String accountName, UUID jobIdentity) {
+        return getDebugDataPathWithServiceResponseAsync(accountName, jobIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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<JobDataPath> getDebugDataPathAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobDataPath> serviceCallback) {
+        return ServiceFuture.fromResponse(getDebugDataPathWithServiceResponseAsync(accountName, jobIdentity), serviceCallback);
+    }
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobDataPath object
+     */
+    public Observable<JobDataPath> getDebugDataPathAsync(String accountName, UUID jobIdentity) {
+        return getDebugDataPathWithServiceResponseAsync(accountName, jobIdentity).map(new Func1<ServiceResponse<JobDataPath>, JobDataPath>() {
+            @Override
+            public JobDataPath call(ServiceResponse<JobDataPath> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the U-SQL job debug data information specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobDataPath object
+     */
+    public Observable<ServiceResponse<JobDataPath>> getDebugDataPathWithServiceResponseAsync(String accountName, UUID jobIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (jobIdentity == null) {
+            throw new IllegalArgumentException("Parameter jobIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.getDebugDataPath(jobIdentity, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobDataPath>>>() {
+                @Override
+                public Observable<ServiceResponse<JobDataPath>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobDataPath> clientResponse = getDebugDataPathDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobDataPath> getDebugDataPathDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobDataPath, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobDataPath>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @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 JobInformation object if successful.
+     */
+    public JobInformation build(String accountName, JobInformation parameters) {
+        return buildWithServiceResponseAsync(accountName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @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<JobInformation> buildAsync(String accountName, JobInformation parameters, final ServiceCallback<JobInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(buildWithServiceResponseAsync(accountName, parameters), serviceCallback);
+    }
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<JobInformation> buildAsync(String accountName, JobInformation parameters) {
+        return buildWithServiceResponseAsync(accountName, parameters).map(new Func1<ServiceResponse<JobInformation>, JobInformation>() {
+            @Override
+            public JobInformation call(ServiceResponse<JobInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Builds (compiles) the specified job in the specified Data Lake Analytics account for job correctness and validation.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param parameters The parameters to build a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<ServiceResponse<JobInformation>> buildWithServiceResponseAsync(String accountName, JobInformation parameters) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.build(parameters, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobInformation> clientResponse = buildDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobInformation> buildDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobInformation, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobInformation>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @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
+     */
+    public void cancel(String accountName, UUID jobIdentity) {
+        cancelWithServiceResponseAsync(accountName, jobIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @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<Void> cancelAsync(String accountName, UUID jobIdentity, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(cancelWithServiceResponseAsync(accountName, jobIdentity), serviceCallback);
+    }
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> cancelAsync(String accountName, UUID jobIdentity) {
+        return cancelWithServiceResponseAsync(accountName, jobIdentity).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Cancels the running job specified by the job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID to cancel.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> cancelWithServiceResponseAsync(String accountName, UUID jobIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (jobIdentity == null) {
+            throw new IllegalArgumentException("Parameter jobIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.cancel(jobIdentity, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = cancelDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> cancelDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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 JobInformation object if successful.
+     */
+    public JobInformation get(String accountName, UUID jobIdentity) {
+        return getWithServiceResponseAsync(accountName, jobIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @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<JobInformation> getAsync(String accountName, UUID jobIdentity, final ServiceCallback<JobInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(accountName, jobIdentity), serviceCallback);
+    }
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<JobInformation> getAsync(String accountName, UUID jobIdentity) {
+        return getWithServiceResponseAsync(accountName, jobIdentity).map(new Func1<ServiceResponse<JobInformation>, JobInformation>() {
+            @Override
+            public JobInformation call(ServiceResponse<JobInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the job information for the specified job ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity JobInfo ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<ServiceResponse<JobInformation>> getWithServiceResponseAsync(String accountName, UUID jobIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (jobIdentity == null) {
+            throw new IllegalArgumentException("Parameter jobIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.get(jobIdentity, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobInformation> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobInformation> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobInformation, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobInformation>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @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 JobInformation object if successful.
+     */
+    public JobInformation create(String accountName, UUID jobIdentity, JobInformation parameters) {
+        return createWithServiceResponseAsync(accountName, jobIdentity, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @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<JobInformation> createAsync(String accountName, UUID jobIdentity, JobInformation parameters, final ServiceCallback<JobInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(createWithServiceResponseAsync(accountName, jobIdentity, parameters), serviceCallback);
+    }
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<JobInformation> createAsync(String accountName, UUID jobIdentity, JobInformation parameters) {
+        return createWithServiceResponseAsync(accountName, jobIdentity, parameters).map(new Func1<ServiceResponse<JobInformation>, JobInformation>() {
+            @Override
+            public JobInformation call(ServiceResponse<JobInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Submits a job to the specified Data Lake Analytics account.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param jobIdentity The job ID (a GUID) for the job being submitted.
+     * @param parameters The parameters to submit a job.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobInformation object
+     */
+    public Observable<ServiceResponse<JobInformation>> createWithServiceResponseAsync(String accountName, UUID jobIdentity, JobInformation parameters) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (jobIdentity == null) {
+            throw new IllegalArgumentException("Parameter jobIdentity is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.create(jobIdentity, parameters, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobInformation> clientResponse = createDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobInformation> createDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobInformation, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobInformation>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    public PagedList<JobInformation> list(final String accountName) {
+        ServiceResponse<Page<JobInformation>> response = listSinglePageAsync(accountName).toBlocking().single();
+        return new PagedList<JobInformation>(response.body()) {
+            @Override
+            public Page<JobInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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<List<JobInformation>> listAsync(final String accountName, final ListOperationCallback<JobInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName),
+            new Func1<String, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<Page<JobInformation>> listAsync(final String accountName) {
+        return listWithServiceResponseAsync(accountName)
+            .map(new Func1<ServiceResponse<Page<JobInformation>>, Page<JobInformation>>() {
+                @Override
+                public Page<JobInformation> call(ServiceResponse<Page<JobInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listWithServiceResponseAsync(final String accountName) {
+        return listSinglePageAsync(accountName)
+            .concatMap(new Func1<ServiceResponse<Page<JobInformation>>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(ServiceResponse<Page<JobInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listSinglePageAsync(final String accountName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        final Integer top = null;
+        final Integer skip = null;
+        final String expand = null;
+        final String select = null;
+        final String orderby = null;
+        final Boolean count = null;
+        final String search = null;
+        final String format = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(filter, top, skip, expand, select, orderby, count, search, format, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    public PagedList<JobInformation> list(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format) {
+        ServiceResponse<Page<JobInformation>> response = listSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count, search, format).toBlocking().single();
+        return new PagedList<JobInformation>(response.body()) {
+            @Override
+            public Page<JobInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @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<List<JobInformation>> listAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format, final ListOperationCallback<JobInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count, search, format),
+            new Func1<String, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<Page<JobInformation>> listAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format) {
+        return listWithServiceResponseAsync(accountName, filter, top, skip, expand, select, orderby, count, search, format)
+            .map(new Func1<ServiceResponse<Page<JobInformation>>, Page<JobInformation>>() {
+                @Override
+                public Page<JobInformation> call(ServiceResponse<Page<JobInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param filter OData filter. Optional.
+     * @param top The number of items to return. Optional.
+     * @param skip The number of items to skip over before returning elements. Optional.
+     * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+     * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+     * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+     * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+     * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+     * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listWithServiceResponseAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format) {
+        return listSinglePageAsync(accountName, filter, top, skip, expand, select, orderby, count, search, format)
+            .concatMap(new Func1<ServiceResponse<Page<JobInformation>>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(ServiceResponse<Page<JobInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+    ServiceResponse<PageImpl<JobInformation>> * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+    ServiceResponse<PageImpl<JobInformation>> * @param filter OData filter. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param top The number of items to return. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param skip The number of items to skip over before returning elements. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param expand OData expansion. Expand related resources in line with the retrieved resources, e.g. Categories/$expand=Products would expand Product data in line with each Category entry. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param select OData Select statement. Limits the properties on each entry to just those requested, e.g. Categories?$select=CategoryName,Description. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param orderby OrderBy clause. One or more comma-separated expressions with an optional "asc" (the default) or "desc" depending on the order you'd like the values sorted, e.g. Categories?$orderby=CategoryName desc. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param count The Boolean value of true or false to request a count of the matching resources included with the resources in the response, e.g. Categories?$count=true. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param search A free form search. A free-text search expression to match for whether a particular entry should be included in the feed, e.g. Categories?$search=blue OR green. Optional.
+    ServiceResponse<PageImpl<JobInformation>> * @param format The return format. Return the response in particular formatxii without access to request headers for standard content-type negotiation (e.g Orders?$format=json). Optional.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listSinglePageAsync(final String accountName, final String filter, final Integer top, final Integer skip, final String expand, final String select, final String orderby, final Boolean count, final String search, final String format) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(filter, top, skip, expand, select, orderby, count, search, format, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobInformation>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobInformation&gt; object if successful.
+     */
+    public PagedList<JobInformation> listNext(final String nextPageLink) {
+        ServiceResponse<Page<JobInformation>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<JobInformation>(response.body()) {
+            @Override
+            public Page<JobInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<JobInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobInformation>> serviceFuture, final ListOperationCallback<JobInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<Page<JobInformation>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<JobInformation>>, Page<JobInformation>>() {
+                @Override
+                public Page<JobInformation> call(ServiceResponse<Page<JobInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<JobInformation>>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(ServiceResponse<Page<JobInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists the jobs, if any, associated with the specified Data Lake Analytics account. The response includes a link to the next page of results, if any.
+     *
+    ServiceResponse<PageImpl<JobInformation>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobInformation>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobInformation>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobInformation>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/PipelinesImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/PipelinesImpl.java
new file mode 100644
index 000000000000..2c383d42c05f
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/PipelinesImpl.java
@@ -0,0 +1,605 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import retrofit2.Retrofit;
+import com.microsoft.azure.datalake.analytics.Pipelines;
+import com.google.common.base.Joiner;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobPipelineInformation;
+import com.microsoft.azure.datalake.analytics.models.PageImpl;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import okhttp3.ResponseBody;
+import org.joda.time.DateTime;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Pipelines.
+ */
+public class PipelinesImpl implements Pipelines {
+    /** The Retrofit service to perform REST calls. */
+    private PipelinesService service;
+    /** The service client containing this operation class. */
+    private DataLakeAnalyticsJobManagementClientImpl client;
+
+    /**
+     * Initializes an instance of PipelinesImpl.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PipelinesImpl(Retrofit retrofit, DataLakeAnalyticsJobManagementClientImpl client) {
+        this.service = retrofit.create(PipelinesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Pipelines to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PipelinesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Pipelines list" })
+        @GET("pipelines")
+        Observable<Response<ResponseBody>> list(@Query("startDateTime") DateTime startDateTime, @Query("endDateTime") DateTime endDateTime, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Pipelines get" })
+        @GET("pipelines/{pipelineIdentity}")
+        Observable<Response<ResponseBody>> get(@Path("pipelineIdentity") UUID pipelineIdentity, @Query("startDateTime") DateTime startDateTime, @Query("endDateTime") DateTime endDateTime, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Pipelines listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    public PagedList<JobPipelineInformation> list(final String accountName) {
+        ServiceResponse<Page<JobPipelineInformation>> response = listSinglePageAsync(accountName).toBlocking().single();
+        return new PagedList<JobPipelineInformation>(response.body()) {
+            @Override
+            public Page<JobPipelineInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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<List<JobPipelineInformation>> listAsync(final String accountName, final ListOperationCallback<JobPipelineInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName),
+            new Func1<String, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<Page<JobPipelineInformation>> listAsync(final String accountName) {
+        return listWithServiceResponseAsync(accountName)
+            .map(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Page<JobPipelineInformation>>() {
+                @Override
+                public Page<JobPipelineInformation> call(ServiceResponse<Page<JobPipelineInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listWithServiceResponseAsync(final String accountName) {
+        return listSinglePageAsync(accountName)
+            .concatMap(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(ServiceResponse<Page<JobPipelineInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobPipelineInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listSinglePageAsync(final String accountName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startDateTime = null;
+        final DateTime endDateTime = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobPipelineInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobPipelineInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    public PagedList<JobPipelineInformation> list(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        ServiceResponse<Page<JobPipelineInformation>> response = listSinglePageAsync(accountName, startDateTime, endDateTime).toBlocking().single();
+        return new PagedList<JobPipelineInformation>(response.body()) {
+            @Override
+            public Page<JobPipelineInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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<List<JobPipelineInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime, final ListOperationCallback<JobPipelineInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName, startDateTime, endDateTime),
+            new Func1<String, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<Page<JobPipelineInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        return listWithServiceResponseAsync(accountName, startDateTime, endDateTime)
+            .map(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Page<JobPipelineInformation>>() {
+                @Override
+                public Page<JobPipelineInformation> call(ServiceResponse<Page<JobPipelineInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listWithServiceResponseAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        return listSinglePageAsync(accountName, startDateTime, endDateTime)
+            .concatMap(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(ServiceResponse<Page<JobPipelineInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+    ServiceResponse<PageImpl<JobPipelineInformation>> * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+    ServiceResponse<PageImpl<JobPipelineInformation>> * @param startDateTime The start date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+    ServiceResponse<PageImpl<JobPipelineInformation>> * @param endDateTime The end date for when to get the list of pipelines. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobPipelineInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listSinglePageAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobPipelineInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobPipelineInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobPipelineInformation>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobPipelineInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobPipelineInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @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 JobPipelineInformation object if successful.
+     */
+    public JobPipelineInformation get(String accountName, UUID pipelineIdentity) {
+        return getWithServiceResponseAsync(accountName, pipelineIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @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<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, final ServiceCallback<JobPipelineInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(accountName, pipelineIdentity), serviceCallback);
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    public Observable<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity) {
+        return getWithServiceResponseAsync(accountName, pipelineIdentity).map(new Func1<ServiceResponse<JobPipelineInformation>, JobPipelineInformation>() {
+            @Override
+            public JobPipelineInformation call(ServiceResponse<JobPipelineInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    public Observable<ServiceResponse<JobPipelineInformation>> getWithServiceResponseAsync(String accountName, UUID pipelineIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (pipelineIdentity == null) {
+            throw new IllegalArgumentException("Parameter pipelineIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startDateTime = null;
+        final DateTime endDateTime = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.get(pipelineIdentity, startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobPipelineInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobPipelineInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobPipelineInformation> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 JobPipelineInformation object if successful.
+     */
+    public JobPipelineInformation get(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime) {
+        return getWithServiceResponseAsync(accountName, pipelineIdentity, startDateTime, endDateTime).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime, final ServiceCallback<JobPipelineInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(accountName, pipelineIdentity, startDateTime, endDateTime), serviceCallback);
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    public Observable<JobPipelineInformation> getAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime) {
+        return getWithServiceResponseAsync(accountName, pipelineIdentity, startDateTime, endDateTime).map(new Func1<ServiceResponse<JobPipelineInformation>, JobPipelineInformation>() {
+            @Override
+            public JobPipelineInformation call(ServiceResponse<JobPipelineInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the Pipeline information for the specified pipeline ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param pipelineIdentity Pipeline ID.
+     * @param startDateTime The start date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the pipeline and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobPipelineInformation object
+     */
+    public Observable<ServiceResponse<JobPipelineInformation>> getWithServiceResponseAsync(String accountName, UUID pipelineIdentity, DateTime startDateTime, DateTime endDateTime) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (pipelineIdentity == null) {
+            throw new IllegalArgumentException("Parameter pipelineIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.get(pipelineIdentity, startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobPipelineInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobPipelineInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobPipelineInformation> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobPipelineInformation> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobPipelineInformation, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobPipelineInformation>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobPipelineInformation&gt; object if successful.
+     */
+    public PagedList<JobPipelineInformation> listNext(final String nextPageLink) {
+        ServiceResponse<Page<JobPipelineInformation>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<JobPipelineInformation>(response.body()) {
+            @Override
+            public Page<JobPipelineInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<JobPipelineInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobPipelineInformation>> serviceFuture, final ListOperationCallback<JobPipelineInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<Page<JobPipelineInformation>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Page<JobPipelineInformation>>() {
+                @Override
+                public Page<JobPipelineInformation> call(ServiceResponse<Page<JobPipelineInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobPipelineInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<JobPipelineInformation>>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(ServiceResponse<Page<JobPipelineInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all pipelines.
+     *
+    ServiceResponse<PageImpl<JobPipelineInformation>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobPipelineInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobPipelineInformation>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobPipelineInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobPipelineInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobPipelineInformation>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobPipelineInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobPipelineInformation>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobPipelineInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobPipelineInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/RecurrencesImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/RecurrencesImpl.java
new file mode 100644
index 000000000000..000428f4304d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/RecurrencesImpl.java
@@ -0,0 +1,605 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.implementation;
+
+import retrofit2.Retrofit;
+import com.microsoft.azure.datalake.analytics.Recurrences;
+import com.google.common.base.Joiner;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.datalake.analytics.models.JobRecurrenceInformation;
+import com.microsoft.azure.datalake.analytics.models.PageImpl;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+import okhttp3.ResponseBody;
+import org.joda.time.DateTime;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Recurrences.
+ */
+public class RecurrencesImpl implements Recurrences {
+    /** The Retrofit service to perform REST calls. */
+    private RecurrencesService service;
+    /** The service client containing this operation class. */
+    private DataLakeAnalyticsJobManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RecurrencesImpl.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RecurrencesImpl(Retrofit retrofit, DataLakeAnalyticsJobManagementClientImpl client) {
+        this.service = retrofit.create(RecurrencesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Recurrences to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RecurrencesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Recurrences list" })
+        @GET("recurrences")
+        Observable<Response<ResponseBody>> list(@Query("startDateTime") DateTime startDateTime, @Query("endDateTime") DateTime endDateTime, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Recurrences get" })
+        @GET("recurrences/{recurrenceIdentity}")
+        Observable<Response<ResponseBody>> get(@Path("recurrenceIdentity") UUID recurrenceIdentity, @Query("startDateTime") DateTime startDateTime, @Query("endDateTime") DateTime endDateTime, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("x-ms-parameterized-host") String parameterizedHost, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.datalake.analytics.Recurrences listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    public PagedList<JobRecurrenceInformation> list(final String accountName) {
+        ServiceResponse<Page<JobRecurrenceInformation>> response = listSinglePageAsync(accountName).toBlocking().single();
+        return new PagedList<JobRecurrenceInformation>(response.body()) {
+            @Override
+            public Page<JobRecurrenceInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @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<List<JobRecurrenceInformation>> listAsync(final String accountName, final ListOperationCallback<JobRecurrenceInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName),
+            new Func1<String, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<Page<JobRecurrenceInformation>> listAsync(final String accountName) {
+        return listWithServiceResponseAsync(accountName)
+            .map(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Page<JobRecurrenceInformation>>() {
+                @Override
+                public Page<JobRecurrenceInformation> call(ServiceResponse<Page<JobRecurrenceInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listWithServiceResponseAsync(final String accountName) {
+        return listSinglePageAsync(accountName)
+            .concatMap(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(ServiceResponse<Page<JobRecurrenceInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobRecurrenceInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listSinglePageAsync(final String accountName) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startDateTime = null;
+        final DateTime endDateTime = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobRecurrenceInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobRecurrenceInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    public PagedList<JobRecurrenceInformation> list(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        ServiceResponse<Page<JobRecurrenceInformation>> response = listSinglePageAsync(accountName, startDateTime, endDateTime).toBlocking().single();
+        return new PagedList<JobRecurrenceInformation>(response.body()) {
+            @Override
+            public Page<JobRecurrenceInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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<List<JobRecurrenceInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime, final ListOperationCallback<JobRecurrenceInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(accountName, startDateTime, endDateTime),
+            new Func1<String, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<Page<JobRecurrenceInformation>> listAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        return listWithServiceResponseAsync(accountName, startDateTime, endDateTime)
+            .map(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Page<JobRecurrenceInformation>>() {
+                @Override
+                public Page<JobRecurrenceInformation> call(ServiceResponse<Page<JobRecurrenceInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listWithServiceResponseAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        return listSinglePageAsync(accountName, startDateTime, endDateTime)
+            .concatMap(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(ServiceResponse<Page<JobRecurrenceInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+    ServiceResponse<PageImpl<JobRecurrenceInformation>> * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+    ServiceResponse<PageImpl<JobRecurrenceInformation>> * @param startDateTime The start date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+    ServiceResponse<PageImpl<JobRecurrenceInformation>> * @param endDateTime The end date for when to get the list of recurrences. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobRecurrenceInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listSinglePageAsync(final String accountName, final DateTime startDateTime, final DateTime endDateTime) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.list(startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobRecurrenceInformation>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobRecurrenceInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobRecurrenceInformation>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobRecurrenceInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobRecurrenceInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @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 JobRecurrenceInformation object if successful.
+     */
+    public JobRecurrenceInformation get(String accountName, UUID recurrenceIdentity) {
+        return getWithServiceResponseAsync(accountName, recurrenceIdentity).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @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<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, final ServiceCallback<JobRecurrenceInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(accountName, recurrenceIdentity), serviceCallback);
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    public Observable<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity) {
+        return getWithServiceResponseAsync(accountName, recurrenceIdentity).map(new Func1<ServiceResponse<JobRecurrenceInformation>, JobRecurrenceInformation>() {
+            @Override
+            public JobRecurrenceInformation call(ServiceResponse<JobRecurrenceInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    public Observable<ServiceResponse<JobRecurrenceInformation>> getWithServiceResponseAsync(String accountName, UUID recurrenceIdentity) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (recurrenceIdentity == null) {
+            throw new IllegalArgumentException("Parameter recurrenceIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final DateTime startDateTime = null;
+        final DateTime endDateTime = null;
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.get(recurrenceIdentity, startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobRecurrenceInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobRecurrenceInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobRecurrenceInformation> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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 JobRecurrenceInformation object if successful.
+     */
+    public JobRecurrenceInformation get(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime) {
+        return getWithServiceResponseAsync(accountName, recurrenceIdentity, startDateTime, endDateTime).toBlocking().single().body();
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @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<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime, final ServiceCallback<JobRecurrenceInformation> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(accountName, recurrenceIdentity, startDateTime, endDateTime), serviceCallback);
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    public Observable<JobRecurrenceInformation> getAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime) {
+        return getWithServiceResponseAsync(accountName, recurrenceIdentity, startDateTime, endDateTime).map(new Func1<ServiceResponse<JobRecurrenceInformation>, JobRecurrenceInformation>() {
+            @Override
+            public JobRecurrenceInformation call(ServiceResponse<JobRecurrenceInformation> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets the recurrence information for the specified recurrence ID.
+     *
+     * @param accountName The Azure Data Lake Analytics account to execute job operations on.
+     * @param recurrenceIdentity Recurrence ID.
+     * @param startDateTime The start date for when to get the recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @param endDateTime The end date for when to get recurrence and aggregate its data. The startDateTime and endDateTime can be no more than 30 days apart.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the JobRecurrenceInformation object
+     */
+    public Observable<ServiceResponse<JobRecurrenceInformation>> getWithServiceResponseAsync(String accountName, UUID recurrenceIdentity, DateTime startDateTime, DateTime endDateTime) {
+        if (accountName == null) {
+            throw new IllegalArgumentException("Parameter accountName is required and cannot be null.");
+        }
+        if (this.client.adlaJobDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.adlaJobDnsSuffix() is required and cannot be null.");
+        }
+        if (recurrenceIdentity == null) {
+            throw new IllegalArgumentException("Parameter recurrenceIdentity is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        String parameterizedHost = Joiner.on(", ").join("{accountName}", accountName, "{adlaJobDnsSuffix}", this.client.adlaJobDnsSuffix());
+        return service.get(recurrenceIdentity, startDateTime, endDateTime, this.client.apiVersion(), this.client.acceptLanguage(), parameterizedHost, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<JobRecurrenceInformation>>>() {
+                @Override
+                public Observable<ServiceResponse<JobRecurrenceInformation>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<JobRecurrenceInformation> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<JobRecurrenceInformation> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<JobRecurrenceInformation, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<JobRecurrenceInformation>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;JobRecurrenceInformation&gt; object if successful.
+     */
+    public PagedList<JobRecurrenceInformation> listNext(final String nextPageLink) {
+        ServiceResponse<Page<JobRecurrenceInformation>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<JobRecurrenceInformation>(response.body()) {
+            @Override
+            public Page<JobRecurrenceInformation> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<JobRecurrenceInformation>> listNextAsync(final String nextPageLink, final ServiceFuture<List<JobRecurrenceInformation>> serviceFuture, final ListOperationCallback<JobRecurrenceInformation> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<Page<JobRecurrenceInformation>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Page<JobRecurrenceInformation>>() {
+                @Override
+                public Page<JobRecurrenceInformation> call(ServiceResponse<Page<JobRecurrenceInformation>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;JobRecurrenceInformation&gt; object
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<JobRecurrenceInformation>>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(ServiceResponse<Page<JobRecurrenceInformation>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all recurrences.
+     *
+    ServiceResponse<PageImpl<JobRecurrenceInformation>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;JobRecurrenceInformation&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<JobRecurrenceInformation>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<JobRecurrenceInformation>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<JobRecurrenceInformation>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<JobRecurrenceInformation>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<JobRecurrenceInformation>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<JobRecurrenceInformation>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<JobRecurrenceInformation>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/package-info.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/package-info.java
new file mode 100644
index 000000000000..7e8a41d78923
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for DataLakeAnalyticsCatalogManagementClient.
+ * Creates an Azure Data Lake Analytics catalog client.
+ */
+package com.microsoft.azure.datalake.analytics.implementation;
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Acl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Acl.java
new file mode 100644
index 000000000000..10d750714191
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Acl.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog access control list (ACL) entry.
+ */
+public class Acl {
+    /**
+     * the access control list (ACL) entry type. UserObj and GroupObj denote
+     * the owning user and group, respectively. Possible values include:
+     * 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     */
+    @JsonProperty(value = "aceType", access = JsonProperty.Access.WRITE_ONLY)
+    private AclType aceType;
+
+    /**
+     * the Azure AD object ID of the user or group being specified in the
+     * access control list (ACL) entry.
+     */
+    @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID principalId;
+
+    /**
+     * the permission type of the access control list (ACL) entry. Possible
+     * values include: 'None', 'Use', 'Create', 'Drop', 'Alter', 'Write',
+     * 'All'.
+     */
+    @JsonProperty(value = "permission", access = JsonProperty.Access.WRITE_ONLY)
+    private PermissionType permission;
+
+    /**
+     * Get the access control list (ACL) entry type. UserObj and GroupObj denote the owning user and group, respectively. Possible values include: 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     *
+     * @return the aceType value
+     */
+    public AclType aceType() {
+        return this.aceType;
+    }
+
+    /**
+     * Get the Azure AD object ID of the user or group being specified in the access control list (ACL) entry.
+     *
+     * @return the principalId value
+     */
+    public UUID principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Get the permission type of the access control list (ACL) entry. Possible values include: 'None', 'Use', 'Create', 'Drop', 'Alter', 'Write', 'All'.
+     *
+     * @return the permission value
+     */
+    public PermissionType permission() {
+        return this.permission;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclCreateOrUpdateParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..d6993107ffc6
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclCreateOrUpdateParameters.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used to create or update an access control list (ACL) entry.
+ */
+public class AclCreateOrUpdateParameters {
+    /**
+     * the access control list (ACL) entry type. UserObj and GroupObj denote
+     * the owning user and group, respectively. Possible values include:
+     * 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     */
+    @JsonProperty(value = "aceType", required = true)
+    private AclType aceType;
+
+    /**
+     * the Azure AD object ID of the user or group being specified in the
+     * access control list (ACL) entry.
+     */
+    @JsonProperty(value = "principalId", required = true)
+    private UUID principalId;
+
+    /**
+     * the permission type of the access control list (ACL) entry. Possible
+     * values include: 'None', 'Use', 'Create', 'Drop', 'Alter', 'Write',
+     * 'All'.
+     */
+    @JsonProperty(value = "permission", required = true)
+    private PermissionType permission;
+
+    /**
+     * Get the access control list (ACL) entry type. UserObj and GroupObj denote the owning user and group, respectively. Possible values include: 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     *
+     * @return the aceType value
+     */
+    public AclType aceType() {
+        return this.aceType;
+    }
+
+    /**
+     * Set the access control list (ACL) entry type. UserObj and GroupObj denote the owning user and group, respectively. Possible values include: 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     *
+     * @param aceType the aceType value to set
+     * @return the AclCreateOrUpdateParameters object itself.
+     */
+    public AclCreateOrUpdateParameters withAceType(AclType aceType) {
+        this.aceType = aceType;
+        return this;
+    }
+
+    /**
+     * Get the Azure AD object ID of the user or group being specified in the access control list (ACL) entry.
+     *
+     * @return the principalId value
+     */
+    public UUID principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Set the Azure AD object ID of the user or group being specified in the access control list (ACL) entry.
+     *
+     * @param principalId the principalId value to set
+     * @return the AclCreateOrUpdateParameters object itself.
+     */
+    public AclCreateOrUpdateParameters withPrincipalId(UUID principalId) {
+        this.principalId = principalId;
+        return this;
+    }
+
+    /**
+     * Get the permission type of the access control list (ACL) entry. Possible values include: 'None', 'Use', 'Create', 'Drop', 'Alter', 'Write', 'All'.
+     *
+     * @return the permission value
+     */
+    public PermissionType permission() {
+        return this.permission;
+    }
+
+    /**
+     * Set the permission type of the access control list (ACL) entry. Possible values include: 'None', 'Use', 'Create', 'Drop', 'Alter', 'Write', 'All'.
+     *
+     * @param permission the permission value to set
+     * @return the AclCreateOrUpdateParameters object itself.
+     */
+    public AclCreateOrUpdateParameters withPermission(PermissionType permission) {
+        this.permission = permission;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclDeleteParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclDeleteParameters.java
new file mode 100644
index 000000000000..d76ce890c41f
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclDeleteParameters.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used to delete an access control list (ACL) entry.
+ */
+public class AclDeleteParameters {
+    /**
+     * the access control list (ACL) entry type. UserObj and GroupObj denote
+     * the owning user and group, respectively. Possible values include:
+     * 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     */
+    @JsonProperty(value = "aceType", required = true)
+    private AclType aceType;
+
+    /**
+     * the Azure AD object ID of the user or group being specified in the
+     * access control list (ACL) entry.
+     */
+    @JsonProperty(value = "principalId", required = true)
+    private UUID principalId;
+
+    /**
+     * Get the access control list (ACL) entry type. UserObj and GroupObj denote the owning user and group, respectively. Possible values include: 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     *
+     * @return the aceType value
+     */
+    public AclType aceType() {
+        return this.aceType;
+    }
+
+    /**
+     * Set the access control list (ACL) entry type. UserObj and GroupObj denote the owning user and group, respectively. Possible values include: 'UserObj', 'GroupObj', 'Other', 'User', 'Group'.
+     *
+     * @param aceType the aceType value to set
+     * @return the AclDeleteParameters object itself.
+     */
+    public AclDeleteParameters withAceType(AclType aceType) {
+        this.aceType = aceType;
+        return this;
+    }
+
+    /**
+     * Get the Azure AD object ID of the user or group being specified in the access control list (ACL) entry.
+     *
+     * @return the principalId value
+     */
+    public UUID principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Set the Azure AD object ID of the user or group being specified in the access control list (ACL) entry.
+     *
+     * @param principalId the principalId value to set
+     * @return the AclDeleteParameters object itself.
+     */
+    public AclDeleteParameters withPrincipalId(UUID principalId) {
+        this.principalId = principalId;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclType.java
new file mode 100644
index 000000000000..5cf894cf838c
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/AclType.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for AclType.
+ */
+public final class AclType extends ExpandableStringEnum<AclType> {
+    /** Static value UserObj for AclType. */
+    public static final AclType USER_OBJ = fromString("UserObj");
+
+    /** Static value GroupObj for AclType. */
+    public static final AclType GROUP_OBJ = fromString("GroupObj");
+
+    /** Static value Other for AclType. */
+    public static final AclType OTHER = fromString("Other");
+
+    /** Static value User for AclType. */
+    public static final AclType USER = fromString("User");
+
+    /** Static value Group for AclType. */
+    public static final AclType GROUP = fromString("Group");
+
+    /**
+     * Creates or finds a AclType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding AclType
+     */
+    @JsonCreator
+    public static AclType fromString(String name) {
+        return fromString(name, AclType.class);
+    }
+
+    /**
+     * @return known AclType values
+     */
+    public static Collection<AclType> values() {
+        return values(AclType.class);
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BaseJobParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BaseJobParameters.java
new file mode 100644
index 000000000000..7f0ceafaf3a1
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BaseJobParameters.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Data Lake Analytics Job Parameters base class for build and submit.
+ */
+public class BaseJobParameters {
+    /**
+     * the job type of the current job (Hive or USql). Possible values include:
+     * 'USql', 'Hive'.
+     */
+    @JsonProperty(value = "type", required = true)
+    private JobType type;
+
+    /**
+     * the job specific properties.
+     */
+    @JsonProperty(value = "properties", required = true)
+    private CreateJobProperties properties;
+
+    /**
+     * Get the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @return the type value
+     */
+    public JobType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @param type the type value to set
+     * @return the BaseJobParameters object itself.
+     */
+    public BaseJobParameters withType(JobType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the job specific properties.
+     *
+     * @return the properties value
+     */
+    public CreateJobProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the job specific properties.
+     *
+     * @param properties the properties value to set
+     * @return the BaseJobParameters object itself.
+     */
+    public BaseJobParameters withProperties(CreateJobProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BuildJobParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BuildJobParameters.java
new file mode 100644
index 000000000000..e9825b8ca5dc
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/BuildJobParameters.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used to build a new Data Lake Analytics job.
+ */
+public class BuildJobParameters extends BaseJobParameters {
+    /**
+     * the friendly name of the job to build.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Get the friendly name of the job to build.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the friendly name of the job to build.
+     *
+     * @param name the name value to set
+     * @return the BuildJobParameters object itself.
+     */
+    public BuildJobParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItem.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItem.java
new file mode 100644
index 000000000000..c3bced2bc6de
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItem.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog item.
+ */
+public class CatalogItem {
+    /**
+     * the name of the Data Lake Analytics account.
+     */
+    @JsonProperty(value = "computeAccountName")
+    private String computeAccountName;
+
+    /**
+     * the version of the catalog item.
+     */
+    @JsonProperty(value = "version")
+    private UUID version;
+
+    /**
+     * Get the name of the Data Lake Analytics account.
+     *
+     * @return the computeAccountName value
+     */
+    public String computeAccountName() {
+        return this.computeAccountName;
+    }
+
+    /**
+     * Set the name of the Data Lake Analytics account.
+     *
+     * @param computeAccountName the computeAccountName value to set
+     * @return the CatalogItem object itself.
+     */
+    public CatalogItem withComputeAccountName(String computeAccountName) {
+        this.computeAccountName = computeAccountName;
+        return this;
+    }
+
+    /**
+     * Get the version of the catalog item.
+     *
+     * @return the version value
+     */
+    public UUID version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version of the catalog item.
+     *
+     * @param version the version value to set
+     * @return the CatalogItem object itself.
+     */
+    public CatalogItem withVersion(UUID version) {
+        this.version = version;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItemList.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItemList.java
new file mode 100644
index 000000000000..02b5c2a74658
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CatalogItemList.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog item list.
+ */
+public class CatalogItemList {
+    /**
+     * the count of items in the list.
+     */
+    @JsonProperty(value = "count")
+    private Integer count;
+
+    /**
+     * the link to the next page of results.
+     */
+    @JsonProperty(value = "nextLink")
+    private String nextLink;
+
+    /**
+     * Get the count of items in the list.
+     *
+     * @return the count value
+     */
+    public Integer count() {
+        return this.count;
+    }
+
+    /**
+     * Set the count of items in the list.
+     *
+     * @param count the count value to set
+     * @return the CatalogItemList object itself.
+     */
+    public CatalogItemList withCount(Integer count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get the link to the next page of results.
+     *
+     * @return the nextLink value
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the link to the next page of results.
+     *
+     * @param nextLink the nextLink value to set
+     * @return the CatalogItemList object itself.
+     */
+    public CatalogItemList withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CompileMode.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CompileMode.java
new file mode 100644
index 000000000000..d5761972f5ce
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CompileMode.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for CompileMode.
+ */
+public enum CompileMode {
+    /** Enum value Semantic. */
+    SEMANTIC("Semantic"),
+
+    /** Enum value Full. */
+    FULL("Full"),
+
+    /** Enum value SingleBox. */
+    SINGLE_BOX("SingleBox");
+
+    /** The actual serialized value for a CompileMode instance. */
+    private String value;
+
+    CompileMode(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a CompileMode instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed CompileMode object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static CompileMode fromString(String value) {
+        CompileMode[] items = CompileMode.values();
+        for (CompileMode item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobParameters.java
new file mode 100644
index 000000000000..6d8698dccb2b
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobParameters.java
@@ -0,0 +1,183 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used to submit a new Data Lake Analytics job.
+ */
+public class CreateJobParameters extends BaseJobParameters {
+    /**
+     * the friendly name of the job to submit.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * the degree of parallelism used for this job. At most one of
+     * degreeOfParallelism and degreeOfParallelismPercent should be specified.
+     * If none, a default value of 1 will be used.
+     */
+    @JsonProperty(value = "degreeOfParallelism")
+    private Integer degreeOfParallelism;
+
+    /**
+     * the degree of parallelism in percentage used for this job. At most one
+     * of degreeOfParallelism and degreeOfParallelismPercent should be
+     * specified. If none, a default value of 1 will be used for
+     * degreeOfParallelism.
+     */
+    @JsonProperty(value = "degreeOfParallelismPercent")
+    private Double degreeOfParallelismPercent;
+
+    /**
+     * the priority value to use for the current job. Lower numbers have a
+     * higher priority. By default, a job has a priority of 1000. This must be
+     * greater than 0.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * the list of log file name patterns to find in the logFolder. '*' is the
+     * only matching character allowed. Example format: jobExecution*.log or
+     * *mylog*.txt.
+     */
+    @JsonProperty(value = "logFilePatterns")
+    private List<String> logFilePatterns;
+
+    /**
+     * the recurring job relationship information properties.
+     */
+    @JsonProperty(value = "related")
+    private JobRelationshipProperties related;
+
+    /**
+     * Get the friendly name of the job to submit.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the friendly name of the job to submit.
+     *
+     * @param name the name value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used.
+     *
+     * @return the degreeOfParallelism value
+     */
+    public Integer degreeOfParallelism() {
+        return this.degreeOfParallelism;
+    }
+
+    /**
+     * Set the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used.
+     *
+     * @param degreeOfParallelism the degreeOfParallelism value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withDegreeOfParallelism(Integer degreeOfParallelism) {
+        this.degreeOfParallelism = degreeOfParallelism;
+        return this;
+    }
+
+    /**
+     * Get the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism.
+     *
+     * @return the degreeOfParallelismPercent value
+     */
+    public Double degreeOfParallelismPercent() {
+        return this.degreeOfParallelismPercent;
+    }
+
+    /**
+     * Set the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism.
+     *
+     * @param degreeOfParallelismPercent the degreeOfParallelismPercent value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withDegreeOfParallelismPercent(Double degreeOfParallelismPercent) {
+        this.degreeOfParallelismPercent = degreeOfParallelismPercent;
+        return this;
+    }
+
+    /**
+     * Get the priority value to use for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set the priority value to use for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @param priority the priority value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt.
+     *
+     * @return the logFilePatterns value
+     */
+    public List<String> logFilePatterns() {
+        return this.logFilePatterns;
+    }
+
+    /**
+     * Set the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt.
+     *
+     * @param logFilePatterns the logFilePatterns value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withLogFilePatterns(List<String> logFilePatterns) {
+        this.logFilePatterns = logFilePatterns;
+        return this;
+    }
+
+    /**
+     * Get the recurring job relationship information properties.
+     *
+     * @return the related value
+     */
+    public JobRelationshipProperties related() {
+        return this.related;
+    }
+
+    /**
+     * Set the recurring job relationship information properties.
+     *
+     * @param related the related value to set
+     * @return the CreateJobParameters object itself.
+     */
+    public CreateJobParameters withRelated(JobRelationshipProperties related) {
+        this.related = related;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobProperties.java
new file mode 100644
index 000000000000..ce97b0723c08
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateJobProperties.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * The common Data Lake Analytics job properties for job submission.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("CreateJobProperties")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "USql", value = CreateUSqlJobProperties.class)
+})
+public class CreateJobProperties {
+    /**
+     * the runtime version of the Data Lake Analytics engine to use for the
+     * specific type of job being run.
+     */
+    @JsonProperty(value = "runtimeVersion")
+    private String runtimeVersion;
+
+    /**
+     * the script to run. Please note that the maximum script size is 3 MB.
+     */
+    @JsonProperty(value = "script", required = true)
+    private String script;
+
+    /**
+     * Get the runtime version of the Data Lake Analytics engine to use for the specific type of job being run.
+     *
+     * @return the runtimeVersion value
+     */
+    public String runtimeVersion() {
+        return this.runtimeVersion;
+    }
+
+    /**
+     * Set the runtime version of the Data Lake Analytics engine to use for the specific type of job being run.
+     *
+     * @param runtimeVersion the runtimeVersion value to set
+     * @return the CreateJobProperties object itself.
+     */
+    public CreateJobProperties withRuntimeVersion(String runtimeVersion) {
+        this.runtimeVersion = runtimeVersion;
+        return this;
+    }
+
+    /**
+     * Get the script to run. Please note that the maximum script size is 3 MB.
+     *
+     * @return the script value
+     */
+    public String script() {
+        return this.script;
+    }
+
+    /**
+     * Set the script to run. Please note that the maximum script size is 3 MB.
+     *
+     * @param script the script value to set
+     * @return the CreateJobProperties object itself.
+     */
+    public CreateJobProperties withScript(String script) {
+        this.script = script;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobParameters.java
new file mode 100644
index 000000000000..879c7a696763
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobParameters.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used to submit a new Data Lake Analytics Scope job. (Only for
+ * use internally with Scope job type.).
+ */
+public class CreateScopeJobParameters extends CreateJobParameters {
+    /**
+     * The key-value pairs used to add additional metadata to the job
+     * information.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Get the key-value pairs used to add additional metadata to the job information.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the key-value pairs used to add additional metadata to the job information.
+     *
+     * @param tags the tags value to set
+     * @return the CreateScopeJobParameters object itself.
+     */
+    public CreateScopeJobParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobProperties.java
new file mode 100644
index 000000000000..d96400a2acec
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateScopeJobProperties.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Scope job properties used when submitting Scope jobs. (Only for use
+ * internally with Scope job type.).
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("Scope")
+public class CreateScopeJobProperties extends CreateJobProperties {
+    /**
+     * The list of resources that are required by the job.
+     */
+    @JsonProperty(value = "resources")
+    private List<ScopeJobResource> resources;
+
+    /**
+     * The list of email addresses, separated by semi-colons, to notify when
+     * the job reaches a terminal state.
+     */
+    @JsonProperty(value = "notifier")
+    private String notifier;
+
+    /**
+     * Get the list of resources that are required by the job.
+     *
+     * @return the resources value
+     */
+    public List<ScopeJobResource> resources() {
+        return this.resources;
+    }
+
+    /**
+     * Set the list of resources that are required by the job.
+     *
+     * @param resources the resources value to set
+     * @return the CreateScopeJobProperties object itself.
+     */
+    public CreateScopeJobProperties withResources(List<ScopeJobResource> resources) {
+        this.resources = resources;
+        return this;
+    }
+
+    /**
+     * Get the list of email addresses, separated by semi-colons, to notify when the job reaches a terminal state.
+     *
+     * @return the notifier value
+     */
+    public String notifier() {
+        return this.notifier;
+    }
+
+    /**
+     * Set the list of email addresses, separated by semi-colons, to notify when the job reaches a terminal state.
+     *
+     * @param notifier the notifier value to set
+     * @return the CreateScopeJobProperties object itself.
+     */
+    public CreateScopeJobProperties withNotifier(String notifier) {
+        this.notifier = notifier;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateUSqlJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateUSqlJobProperties.java
new file mode 100644
index 000000000000..92b4e7e0b8ae
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/CreateUSqlJobProperties.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * U-SQL job properties used when submitting U-SQL jobs.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("USql")
+public class CreateUSqlJobProperties extends CreateJobProperties {
+    /**
+     * the specific compilation mode for the job used during execution. If this
+     * is not specified during submission, the server will determine the
+     * optimal compilation mode. Possible values include: 'Semantic', 'Full',
+     * 'SingleBox'.
+     */
+    @JsonProperty(value = "compileMode")
+    private CompileMode compileMode;
+
+    /**
+     * Get the specific compilation mode for the job used during execution. If this is not specified during submission, the server will determine the optimal compilation mode. Possible values include: 'Semantic', 'Full', 'SingleBox'.
+     *
+     * @return the compileMode value
+     */
+    public CompileMode compileMode() {
+        return this.compileMode;
+    }
+
+    /**
+     * Set the specific compilation mode for the job used during execution. If this is not specified during submission, the server will determine the optimal compilation mode. Possible values include: 'Semantic', 'Full', 'SingleBox'.
+     *
+     * @param compileMode the compileMode value to set
+     * @return the CreateUSqlJobProperties object itself.
+     */
+    public CreateUSqlJobProperties withCompileMode(CompileMode compileMode) {
+        this.compileMode = compileMode;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialCreateParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialCreateParameters.java
new file mode 100644
index 000000000000..3e1ff7fb0a29
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialCreateParameters.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Data Lake Analytics catalog credential creation parameters.
+ */
+public class DataLakeAnalyticsCatalogCredentialCreateParameters {
+    /**
+     * the password for the credential and user with access to the data source.
+     */
+    @JsonProperty(value = "password", required = true)
+    private String password;
+
+    /**
+     * the URI identifier for the data source this credential can connect to in
+     * the format &lt;hostname&gt;:&lt;port&gt;.
+     */
+    @JsonProperty(value = "uri", required = true)
+    private String uri;
+
+    /**
+     * the object identifier for the user associated with this credential with
+     * access to the data source.
+     */
+    @JsonProperty(value = "userId", required = true)
+    private String userId;
+
+    /**
+     * Get the password for the credential and user with access to the data source.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set the password for the credential and user with access to the data source.
+     *
+     * @param password the password value to set
+     * @return the DataLakeAnalyticsCatalogCredentialCreateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialCreateParameters withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Get the URI identifier for the data source this credential can connect to in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Set the URI identifier for the data source this credential can connect to in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @param uri the uri value to set
+     * @return the DataLakeAnalyticsCatalogCredentialCreateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialCreateParameters withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    /**
+     * Get the object identifier for the user associated with this credential with access to the data source.
+     *
+     * @return the userId value
+     */
+    public String userId() {
+        return this.userId;
+    }
+
+    /**
+     * Set the object identifier for the user associated with this credential with access to the data source.
+     *
+     * @param userId the userId value to set
+     * @return the DataLakeAnalyticsCatalogCredentialCreateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialCreateParameters withUserId(String userId) {
+        this.userId = userId;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialDeleteParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialDeleteParameters.java
new file mode 100644
index 000000000000..fd2d445ea78b
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialDeleteParameters.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Data Lake Analytics catalog credential deletion parameters.
+ */
+public class DataLakeAnalyticsCatalogCredentialDeleteParameters {
+    /**
+     * the current password for the credential and user with access to the data
+     * source. This is required if the requester is not the account owner.
+     */
+    @JsonProperty(value = "password")
+    private String password;
+
+    /**
+     * Get the current password for the credential and user with access to the data source. This is required if the requester is not the account owner.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set the current password for the credential and user with access to the data source. This is required if the requester is not the account owner.
+     *
+     * @param password the password value to set
+     * @return the DataLakeAnalyticsCatalogCredentialDeleteParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialDeleteParameters withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialUpdateParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialUpdateParameters.java
new file mode 100644
index 000000000000..d7e2c0f01007
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogCredentialUpdateParameters.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Data Lake Analytics catalog credential update parameters.
+ */
+public class DataLakeAnalyticsCatalogCredentialUpdateParameters {
+    /**
+     * the current password for the credential and user with access to the data
+     * source. This is required if the requester is not the account owner.
+     */
+    @JsonProperty(value = "password")
+    private String password;
+
+    /**
+     * the new password for the credential and user with access to the data
+     * source.
+     */
+    @JsonProperty(value = "newPassword")
+    private String newPassword;
+
+    /**
+     * the URI identifier for the data source this credential can connect to in
+     * the format &lt;hostname&gt;:&lt;port&gt;.
+     */
+    @JsonProperty(value = "uri")
+    private String uri;
+
+    /**
+     * the object identifier for the user associated with this credential with
+     * access to the data source.
+     */
+    @JsonProperty(value = "userId")
+    private String userId;
+
+    /**
+     * Get the current password for the credential and user with access to the data source. This is required if the requester is not the account owner.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set the current password for the credential and user with access to the data source. This is required if the requester is not the account owner.
+     *
+     * @param password the password value to set
+     * @return the DataLakeAnalyticsCatalogCredentialUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialUpdateParameters withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Get the new password for the credential and user with access to the data source.
+     *
+     * @return the newPassword value
+     */
+    public String newPassword() {
+        return this.newPassword;
+    }
+
+    /**
+     * Set the new password for the credential and user with access to the data source.
+     *
+     * @param newPassword the newPassword value to set
+     * @return the DataLakeAnalyticsCatalogCredentialUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialUpdateParameters withNewPassword(String newPassword) {
+        this.newPassword = newPassword;
+        return this;
+    }
+
+    /**
+     * Get the URI identifier for the data source this credential can connect to in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Set the URI identifier for the data source this credential can connect to in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @param uri the uri value to set
+     * @return the DataLakeAnalyticsCatalogCredentialUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialUpdateParameters withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    /**
+     * Get the object identifier for the user associated with this credential with access to the data source.
+     *
+     * @return the userId value
+     */
+    public String userId() {
+        return this.userId;
+    }
+
+    /**
+     * Set the object identifier for the user associated with this credential with access to the data source.
+     *
+     * @param userId the userId value to set
+     * @return the DataLakeAnalyticsCatalogCredentialUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogCredentialUpdateParameters withUserId(String userId) {
+        this.userId = userId;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java
new file mode 100644
index 000000000000..018cab8797f6
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DataLakeAnalytics DataLakeAnalyticsAccount information.
+ */
+public class DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters {
+    /**
+     * the password for the secret to pass in.
+     */
+    @JsonProperty(value = "password", required = true)
+    private String password;
+
+    /**
+     * the URI identifier for the secret in the format
+     * &lt;hostname&gt;:&lt;port&gt;.
+     */
+    @JsonProperty(value = "uri")
+    private String uri;
+
+    /**
+     * Get the password for the secret to pass in.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set the password for the secret to pass in.
+     *
+     * @param password the password value to set
+     * @return the DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Get the URI identifier for the secret in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Set the URI identifier for the secret in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @param uri the uri value to set
+     * @return the DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters object itself.
+     */
+    public DataLakeAnalyticsCatalogSecretCreateOrUpdateParameters withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DdlName.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DdlName.java
new file mode 100644
index 000000000000..705d4effcf15
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/DdlName.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics DDL name item.
+ */
+public class DdlName {
+    /**
+     * the name of the table associated with this database and schema.
+     */
+    @JsonProperty(value = "firstPart")
+    private String firstPart;
+
+    /**
+     * the name of the table associated with this database and schema.
+     */
+    @JsonProperty(value = "secondPart")
+    private String secondPart;
+
+    /**
+     * the name of the table associated with this database and schema.
+     */
+    @JsonProperty(value = "thirdPart")
+    private String thirdPart;
+
+    /**
+     * the name of the table associated with this database and schema.
+     */
+    @JsonProperty(value = "server")
+    private String server;
+
+    /**
+     * Get the name of the table associated with this database and schema.
+     *
+     * @return the firstPart value
+     */
+    public String firstPart() {
+        return this.firstPart;
+    }
+
+    /**
+     * Set the name of the table associated with this database and schema.
+     *
+     * @param firstPart the firstPart value to set
+     * @return the DdlName object itself.
+     */
+    public DdlName withFirstPart(String firstPart) {
+        this.firstPart = firstPart;
+        return this;
+    }
+
+    /**
+     * Get the name of the table associated with this database and schema.
+     *
+     * @return the secondPart value
+     */
+    public String secondPart() {
+        return this.secondPart;
+    }
+
+    /**
+     * Set the name of the table associated with this database and schema.
+     *
+     * @param secondPart the secondPart value to set
+     * @return the DdlName object itself.
+     */
+    public DdlName withSecondPart(String secondPart) {
+        this.secondPart = secondPart;
+        return this;
+    }
+
+    /**
+     * Get the name of the table associated with this database and schema.
+     *
+     * @return the thirdPart value
+     */
+    public String thirdPart() {
+        return this.thirdPart;
+    }
+
+    /**
+     * Set the name of the table associated with this database and schema.
+     *
+     * @param thirdPart the thirdPart value to set
+     * @return the DdlName object itself.
+     */
+    public DdlName withThirdPart(String thirdPart) {
+        this.thirdPart = thirdPart;
+        return this;
+    }
+
+    /**
+     * Get the name of the table associated with this database and schema.
+     *
+     * @return the server value
+     */
+    public String server() {
+        return this.server;
+    }
+
+    /**
+     * Set the name of the table associated with this database and schema.
+     *
+     * @param server the server value to set
+     * @return the DdlName object itself.
+     */
+    public DdlName withServer(String server) {
+        this.server = server;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Diagnostics.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Diagnostics.java
new file mode 100644
index 000000000000..e06275f984a6
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/Diagnostics.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Diagnostics model.
+ */
+public class Diagnostics {
+    /**
+     * the column where the error occured.
+     */
+    @JsonProperty(value = "columnNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer columnNumber;
+
+    /**
+     * the ending index of the error.
+     */
+    @JsonProperty(value = "end", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer end;
+
+    /**
+     * the line number the error occured on.
+     */
+    @JsonProperty(value = "lineNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer lineNumber;
+
+    /**
+     * the error message.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * the severity of the error. Possible values include: 'Warning', 'Error',
+     * 'Info'.
+     */
+    @JsonProperty(value = "severity", access = JsonProperty.Access.WRITE_ONLY)
+    private SeverityTypes severity;
+
+    /**
+     * the starting index of the error.
+     */
+    @JsonProperty(value = "start", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer start;
+
+    /**
+     * Get the column where the error occured.
+     *
+     * @return the columnNumber value
+     */
+    public Integer columnNumber() {
+        return this.columnNumber;
+    }
+
+    /**
+     * Get the ending index of the error.
+     *
+     * @return the end value
+     */
+    public Integer end() {
+        return this.end;
+    }
+
+    /**
+     * Get the line number the error occured on.
+     *
+     * @return the lineNumber value
+     */
+    public Integer lineNumber() {
+        return this.lineNumber;
+    }
+
+    /**
+     * Get the error message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get the severity of the error. Possible values include: 'Warning', 'Error', 'Info'.
+     *
+     * @return the severity value
+     */
+    public SeverityTypes severity() {
+        return this.severity;
+    }
+
+    /**
+     * Get the starting index of the error.
+     *
+     * @return the start value
+     */
+    public Integer start() {
+        return this.start;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/EntityId.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/EntityId.java
new file mode 100644
index 000000000000..b04caf16ff57
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/EntityId.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog entity identifier object.
+ */
+public class EntityId {
+    /**
+     * the name of the external table associated with this database, schema and
+     * table.
+     */
+    @JsonProperty(value = "name")
+    private DdlName name;
+
+    /**
+     * the version of the external data source.
+     */
+    @JsonProperty(value = "version")
+    private UUID version;
+
+    /**
+     * Get the name of the external table associated with this database, schema and table.
+     *
+     * @return the name value
+     */
+    public DdlName name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the external table associated with this database, schema and table.
+     *
+     * @param name the name value to set
+     * @return the EntityId object itself.
+     */
+    public EntityId withName(DdlName name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the version of the external data source.
+     *
+     * @return the version value
+     */
+    public UUID version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version of the external data source.
+     *
+     * @param version the version value to set
+     * @return the EntityId object itself.
+     */
+    public EntityId withVersion(UUID version) {
+        this.version = version;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ExternalTable.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ExternalTable.java
new file mode 100644
index 000000000000..a29486161a57
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ExternalTable.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog external table item.
+ */
+public class ExternalTable {
+    /**
+     * the name of the table associated with this database and schema.
+     */
+    @JsonProperty(value = "tableName")
+    private String tableName;
+
+    /**
+     * the data source associated with this external table.
+     */
+    @JsonProperty(value = "dataSource")
+    private EntityId dataSource;
+
+    /**
+     * Get the name of the table associated with this database and schema.
+     *
+     * @return the tableName value
+     */
+    public String tableName() {
+        return this.tableName;
+    }
+
+    /**
+     * Set the name of the table associated with this database and schema.
+     *
+     * @param tableName the tableName value to set
+     * @return the ExternalTable object itself.
+     */
+    public ExternalTable withTableName(String tableName) {
+        this.tableName = tableName;
+        return this;
+    }
+
+    /**
+     * Get the data source associated with this external table.
+     *
+     * @return the dataSource value
+     */
+    public EntityId dataSource() {
+        return this.dataSource;
+    }
+
+    /**
+     * Set the data source associated with this external table.
+     *
+     * @param dataSource the dataSource value to set
+     * @return the ExternalTable object itself.
+     */
+    public ExternalTable withDataSource(EntityId dataSource) {
+        this.dataSource = dataSource;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/FileType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/FileType.java
new file mode 100644
index 000000000000..cd733e8cfcfb
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/FileType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for FileType.
+ */
+public enum FileType {
+    /** Enum value Assembly. */
+    ASSEMBLY("Assembly"),
+
+    /** Enum value Resource. */
+    RESOURCE("Resource");
+
+    /** The actual serialized value for a FileType instance. */
+    private String value;
+
+    FileType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a FileType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed FileType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static FileType fromString(String value) {
+        FileType[] items = FileType.values();
+        for (FileType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobProperties.java
new file mode 100644
index 000000000000..5fe362421802
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobProperties.java
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The HiveJobProperties model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("Hive")
+public class HiveJobProperties extends JobProperties {
+    /**
+     * Gets or sets the statement information for each statement in the script.
+     */
+    @JsonProperty(value = "statementInfo")
+    private List<HiveJobStatementInfo> statementInfo;
+
+    /**
+     * Gets or sets the Hive logs location.
+     */
+    @JsonProperty(value = "logsLocation")
+    private String logsLocation;
+
+    /**
+     * Gets or sets the runtime version of the U-SQL engine to use.
+     */
+    @JsonProperty(value = "warehouseLocation")
+    private String warehouseLocation;
+
+    /**
+     * Gets or sets the number of statements that will be run based on the
+     * script.
+     */
+    @JsonProperty(value = "statementCount")
+    private Integer statementCount;
+
+    /**
+     * Gets or sets the number of statements that have been run based on the
+     * script.
+     */
+    @JsonProperty(value = "executedStatementCount")
+    private Integer executedStatementCount;
+
+    /**
+     * Get gets or sets the statement information for each statement in the script.
+     *
+     * @return the statementInfo value
+     */
+    public List<HiveJobStatementInfo> statementInfo() {
+        return this.statementInfo;
+    }
+
+    /**
+     * Set gets or sets the statement information for each statement in the script.
+     *
+     * @param statementInfo the statementInfo value to set
+     * @return the HiveJobProperties object itself.
+     */
+    public HiveJobProperties withStatementInfo(List<HiveJobStatementInfo> statementInfo) {
+        this.statementInfo = statementInfo;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the Hive logs location.
+     *
+     * @return the logsLocation value
+     */
+    public String logsLocation() {
+        return this.logsLocation;
+    }
+
+    /**
+     * Set gets or sets the Hive logs location.
+     *
+     * @param logsLocation the logsLocation value to set
+     * @return the HiveJobProperties object itself.
+     */
+    public HiveJobProperties withLogsLocation(String logsLocation) {
+        this.logsLocation = logsLocation;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the runtime version of the U-SQL engine to use.
+     *
+     * @return the warehouseLocation value
+     */
+    public String warehouseLocation() {
+        return this.warehouseLocation;
+    }
+
+    /**
+     * Set gets or sets the runtime version of the U-SQL engine to use.
+     *
+     * @param warehouseLocation the warehouseLocation value to set
+     * @return the HiveJobProperties object itself.
+     */
+    public HiveJobProperties withWarehouseLocation(String warehouseLocation) {
+        this.warehouseLocation = warehouseLocation;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the number of statements that will be run based on the script.
+     *
+     * @return the statementCount value
+     */
+    public Integer statementCount() {
+        return this.statementCount;
+    }
+
+    /**
+     * Set gets or sets the number of statements that will be run based on the script.
+     *
+     * @param statementCount the statementCount value to set
+     * @return the HiveJobProperties object itself.
+     */
+    public HiveJobProperties withStatementCount(Integer statementCount) {
+        this.statementCount = statementCount;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the number of statements that have been run based on the script.
+     *
+     * @return the executedStatementCount value
+     */
+    public Integer executedStatementCount() {
+        return this.executedStatementCount;
+    }
+
+    /**
+     * Set gets or sets the number of statements that have been run based on the script.
+     *
+     * @param executedStatementCount the executedStatementCount value to set
+     * @return the HiveJobProperties object itself.
+     */
+    public HiveJobProperties withExecutedStatementCount(Integer executedStatementCount) {
+        this.executedStatementCount = executedStatementCount;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobStatementInfo.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobStatementInfo.java
new file mode 100644
index 000000000000..4edb3bb761ea
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/HiveJobStatementInfo.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The HiveJobStatementInfo model.
+ */
+public class HiveJobStatementInfo {
+    /**
+     * Gets or sets the log location for this statement.
+     */
+    @JsonProperty(value = "logLocation")
+    private String logLocation;
+
+    /**
+     * Gets or sets the result preview location for this statement.
+     */
+    @JsonProperty(value = "resultPreviewLocation")
+    private String resultPreviewLocation;
+
+    /**
+     * Gets or sets the result location for this statement.
+     */
+    @JsonProperty(value = "resultLocation")
+    private String resultLocation;
+
+    /**
+     * Gets or sets the error message for this statement.
+     */
+    @JsonProperty(value = "errorMessage")
+    private String errorMessage;
+
+    /**
+     * Get gets or sets the log location for this statement.
+     *
+     * @return the logLocation value
+     */
+    public String logLocation() {
+        return this.logLocation;
+    }
+
+    /**
+     * Set gets or sets the log location for this statement.
+     *
+     * @param logLocation the logLocation value to set
+     * @return the HiveJobStatementInfo object itself.
+     */
+    public HiveJobStatementInfo withLogLocation(String logLocation) {
+        this.logLocation = logLocation;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the result preview location for this statement.
+     *
+     * @return the resultPreviewLocation value
+     */
+    public String resultPreviewLocation() {
+        return this.resultPreviewLocation;
+    }
+
+    /**
+     * Set gets or sets the result preview location for this statement.
+     *
+     * @param resultPreviewLocation the resultPreviewLocation value to set
+     * @return the HiveJobStatementInfo object itself.
+     */
+    public HiveJobStatementInfo withResultPreviewLocation(String resultPreviewLocation) {
+        this.resultPreviewLocation = resultPreviewLocation;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the result location for this statement.
+     *
+     * @return the resultLocation value
+     */
+    public String resultLocation() {
+        return this.resultLocation;
+    }
+
+    /**
+     * Set gets or sets the result location for this statement.
+     *
+     * @param resultLocation the resultLocation value to set
+     * @return the HiveJobStatementInfo object itself.
+     */
+    public HiveJobStatementInfo withResultLocation(String resultLocation) {
+        this.resultLocation = resultLocation;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the error message for this statement.
+     *
+     * @return the errorMessage value
+     */
+    public String errorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * Set gets or sets the error message for this statement.
+     *
+     * @param errorMessage the errorMessage value to set
+     * @return the HiveJobStatementInfo object itself.
+     */
+    public HiveJobStatementInfo withErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobDataPath.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobDataPath.java
new file mode 100644
index 000000000000..5bfeff1aed52
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobDataPath.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics U-SQL job data path item.
+ */
+public class JobDataPath {
+    /**
+     * Gets the id of the job this data is for.
+     */
+    @JsonProperty(value = "jobId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID jobId;
+
+    /**
+     * Gets the command that this job data relates to.
+     */
+    @JsonProperty(value = "command", access = JsonProperty.Access.WRITE_ONLY)
+    private String command;
+
+    /**
+     * Gets the list of paths to all of the job data.
+     */
+    @JsonProperty(value = "paths", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> paths;
+
+    /**
+     * Get gets the id of the job this data is for.
+     *
+     * @return the jobId value
+     */
+    public UUID jobId() {
+        return this.jobId;
+    }
+
+    /**
+     * Get gets the command that this job data relates to.
+     *
+     * @return the command value
+     */
+    public String command() {
+        return this.command;
+    }
+
+    /**
+     * Get gets the list of paths to all of the job data.
+     *
+     * @return the paths value
+     */
+    public List<String> paths() {
+        return this.paths;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobErrorDetails.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobErrorDetails.java
new file mode 100644
index 000000000000..a2f430f2f187
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobErrorDetails.java
@@ -0,0 +1,231 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics job error details.
+ */
+public class JobErrorDetails {
+    /**
+     * Gets the error message description.
+     */
+    @JsonProperty(value = "description", access = JsonProperty.Access.WRITE_ONLY)
+    private String description;
+
+    /**
+     * Gets the details of the error message.
+     */
+    @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
+    private String details;
+
+    /**
+     * Gets the end offset in the job where the error was found.
+     */
+    @JsonProperty(value = "endOffset", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer endOffset;
+
+    /**
+     * Gets the specific identifier for the type of error encountered in the
+     * job.
+     */
+    @JsonProperty(value = "errorId", access = JsonProperty.Access.WRITE_ONLY)
+    private String errorId;
+
+    /**
+     * Gets the path to any supplemental error files, if any.
+     */
+    @JsonProperty(value = "filePath", access = JsonProperty.Access.WRITE_ONLY)
+    private String filePath;
+
+    /**
+     * Gets the link to MSDN or Azure help for this type of error, if any.
+     */
+    @JsonProperty(value = "helpLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String helpLink;
+
+    /**
+     * Gets the internal diagnostic stack trace if the user requesting the job
+     * error details has sufficient permissions it will be retrieved, otherwise
+     * it will be empty.
+     */
+    @JsonProperty(value = "internalDiagnostics", access = JsonProperty.Access.WRITE_ONLY)
+    private String internalDiagnostics;
+
+    /**
+     * Gets the specific line number in the job where the error occured.
+     */
+    @JsonProperty(value = "lineNumber", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer lineNumber;
+
+    /**
+     * Gets the user friendly error message for the failure.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Gets the recommended resolution for the failure, if any.
+     */
+    @JsonProperty(value = "resolution", access = JsonProperty.Access.WRITE_ONLY)
+    private String resolution;
+
+    /**
+     * Gets the inner error of this specific job error message, if any.
+     */
+    @JsonProperty(value = "InnerError", access = JsonProperty.Access.WRITE_ONLY)
+    private JobInnerError innerError;
+
+    /**
+     * Gets the severity level of the failure. Possible values include:
+     * 'Warning', 'Error'.
+     */
+    @JsonProperty(value = "severity", access = JsonProperty.Access.WRITE_ONLY)
+    private SeverityTypes severity;
+
+    /**
+     * Gets the ultimate source of the failure (usually either SYSTEM or USER).
+     */
+    @JsonProperty(value = "source", access = JsonProperty.Access.WRITE_ONLY)
+    private String source;
+
+    /**
+     * Gets the start offset in the job where the error was found.
+     */
+    @JsonProperty(value = "startOffset", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer startOffset;
+
+    /**
+     * Get gets the error message description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Get gets the details of the error message.
+     *
+     * @return the details value
+     */
+    public String details() {
+        return this.details;
+    }
+
+    /**
+     * Get gets the end offset in the job where the error was found.
+     *
+     * @return the endOffset value
+     */
+    public Integer endOffset() {
+        return this.endOffset;
+    }
+
+    /**
+     * Get gets the specific identifier for the type of error encountered in the job.
+     *
+     * @return the errorId value
+     */
+    public String errorId() {
+        return this.errorId;
+    }
+
+    /**
+     * Get gets the path to any supplemental error files, if any.
+     *
+     * @return the filePath value
+     */
+    public String filePath() {
+        return this.filePath;
+    }
+
+    /**
+     * Get gets the link to MSDN or Azure help for this type of error, if any.
+     *
+     * @return the helpLink value
+     */
+    public String helpLink() {
+        return this.helpLink;
+    }
+
+    /**
+     * Get gets the internal diagnostic stack trace if the user requesting the job error details has sufficient permissions it will be retrieved, otherwise it will be empty.
+     *
+     * @return the internalDiagnostics value
+     */
+    public String internalDiagnostics() {
+        return this.internalDiagnostics;
+    }
+
+    /**
+     * Get gets the specific line number in the job where the error occured.
+     *
+     * @return the lineNumber value
+     */
+    public Integer lineNumber() {
+        return this.lineNumber;
+    }
+
+    /**
+     * Get gets the user friendly error message for the failure.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get gets the recommended resolution for the failure, if any.
+     *
+     * @return the resolution value
+     */
+    public String resolution() {
+        return this.resolution;
+    }
+
+    /**
+     * Get gets the inner error of this specific job error message, if any.
+     *
+     * @return the innerError value
+     */
+    public JobInnerError innerError() {
+        return this.innerError;
+    }
+
+    /**
+     * Get gets the severity level of the failure. Possible values include: 'Warning', 'Error'.
+     *
+     * @return the severity value
+     */
+    public SeverityTypes severity() {
+        return this.severity;
+    }
+
+    /**
+     * Get gets the ultimate source of the failure (usually either SYSTEM or USER).
+     *
+     * @return the source value
+     */
+    public String source() {
+        return this.source;
+    }
+
+    /**
+     * Get gets the start offset in the job where the error was found.
+     *
+     * @return the startOffset value
+     */
+    public Integer startOffset() {
+        return this.startOffset;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformation.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformation.java
new file mode 100644
index 000000000000..63c1055741f0
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformation.java
@@ -0,0 +1,343 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import java.util.List;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The common Data Lake Analytics job information properties.
+ */
+public class JobInformation {
+    /**
+     * Gets or sets the job's unique identifier (a GUID).
+     */
+    @JsonProperty(value = "jobId")
+    private UUID jobId;
+
+    /**
+     * Gets or sets the friendly name of the job.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * Gets or sets the job type of the current job (Hive or USql). Possible
+     * values include: 'USql', 'Hive'.
+     */
+    @JsonProperty(value = "type", required = true)
+    private JobType type;
+
+    /**
+     * Gets or sets the user or account that submitted the job.
+     */
+    @JsonProperty(value = "submitter")
+    private String submitter;
+
+    /**
+     * Gets the error message details for the job, if the job failed.
+     */
+    @JsonProperty(value = "errorMessage", access = JsonProperty.Access.WRITE_ONLY)
+    private List<JobErrorDetails> errorMessage;
+
+    /**
+     * Gets or sets the degree of parallelism used for this job. This must be
+     * greater than 0.
+     */
+    @JsonProperty(value = "degreeOfParallelism")
+    private Integer degreeOfParallelism;
+
+    /**
+     * the degree of parallelism in percentage used for this job.
+     */
+    @JsonProperty(value = "degreeOfParallelismPercent")
+    private Double degreeOfParallelismPercent;
+
+    /**
+     * Gets or sets the priority value for the current job. Lower numbers have
+     * a higher priority. By default, a job has a priority of 1000. This must
+     * be greater than 0.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * Gets the time the job was submitted to the service.
+     */
+    @JsonProperty(value = "submitTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime submitTime;
+
+    /**
+     * Gets the start time of the job.
+     */
+    @JsonProperty(value = "startTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startTime;
+
+    /**
+     * Gets the completion time of the job.
+     */
+    @JsonProperty(value = "endTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endTime;
+
+    /**
+     * Gets the job state. When the job is in the Ended state, refer to Result
+     * and ErrorMessage for details. Possible values include: 'Accepted',
+     * 'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
+     * 'Starting', 'Paused', 'WaitingForCapacity'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private JobState state;
+
+    /**
+     * Gets the result of job execution or the current result of the running
+     * job. Possible values include: 'None', 'Succeeded', 'Cancelled',
+     * 'Failed'.
+     */
+    @JsonProperty(value = "result", access = JsonProperty.Access.WRITE_ONLY)
+    private JobResult result;
+
+    /**
+     * Gets the job state audit records, indicating when various operations
+     * have been performed on this job.
+     */
+    @JsonProperty(value = "stateAuditRecords", access = JsonProperty.Access.WRITE_ONLY)
+    private List<JobStateAuditRecord> stateAuditRecords;
+
+    /**
+     * Gets or sets the job specific properties.
+     */
+    @JsonProperty(value = "properties", required = true)
+    private JobProperties properties;
+
+    /**
+     * Get gets or sets the job's unique identifier (a GUID).
+     *
+     * @return the jobId value
+     */
+    public UUID jobId() {
+        return this.jobId;
+    }
+
+    /**
+     * Set gets or sets the job's unique identifier (a GUID).
+     *
+     * @param jobId the jobId value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withJobId(UUID jobId) {
+        this.jobId = jobId;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the friendly name of the job.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set gets or sets the friendly name of the job.
+     *
+     * @param name the name value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @return the type value
+     */
+    public JobType type() {
+        return this.type;
+    }
+
+    /**
+     * Set gets or sets the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @param type the type value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withType(JobType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the user or account that submitted the job.
+     *
+     * @return the submitter value
+     */
+    public String submitter() {
+        return this.submitter;
+    }
+
+    /**
+     * Set gets or sets the user or account that submitted the job.
+     *
+     * @param submitter the submitter value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withSubmitter(String submitter) {
+        this.submitter = submitter;
+        return this;
+    }
+
+    /**
+     * Get gets the error message details for the job, if the job failed.
+     *
+     * @return the errorMessage value
+     */
+    public List<JobErrorDetails> errorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * Get gets or sets the degree of parallelism used for this job. This must be greater than 0.
+     *
+     * @return the degreeOfParallelism value
+     */
+    public Integer degreeOfParallelism() {
+        return this.degreeOfParallelism;
+    }
+
+    /**
+     * Set gets or sets the degree of parallelism used for this job. This must be greater than 0.
+     *
+     * @param degreeOfParallelism the degreeOfParallelism value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withDegreeOfParallelism(Integer degreeOfParallelism) {
+        this.degreeOfParallelism = degreeOfParallelism;
+        return this;
+    }
+
+    /**
+     * Get the degree of parallelism in percentage used for this job.
+     *
+     * @return the degreeOfParallelismPercent value
+     */
+    public Double degreeOfParallelismPercent() {
+        return this.degreeOfParallelismPercent;
+    }
+
+    /**
+     * Set the degree of parallelism in percentage used for this job.
+     *
+     * @param degreeOfParallelismPercent the degreeOfParallelismPercent value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withDegreeOfParallelismPercent(Double degreeOfParallelismPercent) {
+        this.degreeOfParallelismPercent = degreeOfParallelismPercent;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set gets or sets the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @param priority the priority value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get gets the time the job was submitted to the service.
+     *
+     * @return the submitTime value
+     */
+    public DateTime submitTime() {
+        return this.submitTime;
+    }
+
+    /**
+     * Get gets the start time of the job.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Get gets the completion time of the job.
+     *
+     * @return the endTime value
+     */
+    public DateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Get gets the job state. When the job is in the Ended state, refer to Result and ErrorMessage for details. Possible values include: 'Accepted', 'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling', 'Starting', 'Paused', 'WaitingForCapacity'.
+     *
+     * @return the state value
+     */
+    public JobState state() {
+        return this.state;
+    }
+
+    /**
+     * Get gets the result of job execution or the current result of the running job. Possible values include: 'None', 'Succeeded', 'Cancelled', 'Failed'.
+     *
+     * @return the result value
+     */
+    public JobResult result() {
+        return this.result;
+    }
+
+    /**
+     * Get gets the job state audit records, indicating when various operations have been performed on this job.
+     *
+     * @return the stateAuditRecords value
+     */
+    public List<JobStateAuditRecord> stateAuditRecords() {
+        return this.stateAuditRecords;
+    }
+
+    /**
+     * Get gets or sets the job specific properties.
+     *
+     * @return the properties value
+     */
+    public JobProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set gets or sets the job specific properties.
+     *
+     * @param properties the properties value to set
+     * @return the JobInformation object itself.
+     */
+    public JobInformation withProperties(JobProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformationBasic.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformationBasic.java
new file mode 100644
index 000000000000..9ae5f1f4597f
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInformationBasic.java
@@ -0,0 +1,288 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The common Data Lake Analytics job information properties.
+ */
+public class JobInformationBasic {
+    /**
+     * the job's unique identifier (a GUID).
+     */
+    @JsonProperty(value = "jobId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID jobId;
+
+    /**
+     * the friendly name of the job.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * the job type of the current job (Hive or USql). Possible values include:
+     * 'USql', 'Hive'.
+     */
+    @JsonProperty(value = "type", required = true)
+    private JobType type;
+
+    /**
+     * the user or account that submitted the job.
+     */
+    @JsonProperty(value = "submitter", access = JsonProperty.Access.WRITE_ONLY)
+    private String submitter;
+
+    /**
+     * the degree of parallelism used for this job.
+     */
+    @JsonProperty(value = "degreeOfParallelism", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer degreeOfParallelism;
+
+    /**
+     * the degree of parallelism in percentage used for this job.
+     */
+    @JsonProperty(value = "degreeOfParallelismPercent", access = JsonProperty.Access.WRITE_ONLY)
+    private Double degreeOfParallelismPercent;
+
+    /**
+     * the priority value for the current job. Lower numbers have a higher
+     * priority. By default, a job has a priority of 1000. This must be greater
+     * than 0.
+     */
+    @JsonProperty(value = "priority", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer priority;
+
+    /**
+     * the time the job was submitted to the service.
+     */
+    @JsonProperty(value = "submitTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime submitTime;
+
+    /**
+     * the start time of the job.
+     */
+    @JsonProperty(value = "startTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime startTime;
+
+    /**
+     * the completion time of the job.
+     */
+    @JsonProperty(value = "endTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime endTime;
+
+    /**
+     * the job state. When the job is in the Ended state, refer to Result and
+     * ErrorMessage for details. Possible values include: 'Accepted',
+     * 'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
+     * 'Starting', 'Paused', 'WaitingForCapacity'.
+     */
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
+    private JobState state;
+
+    /**
+     * the result of job execution or the current result of the running job.
+     * Possible values include: 'None', 'Succeeded', 'Cancelled', 'Failed'.
+     */
+    @JsonProperty(value = "result", access = JsonProperty.Access.WRITE_ONLY)
+    private JobResult result;
+
+    /**
+     * the log folder path to use in the following format:
+     * adl://&lt;accountName&gt;.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/.
+     */
+    @JsonProperty(value = "logFolder", access = JsonProperty.Access.WRITE_ONLY)
+    private String logFolder;
+
+    /**
+     * the list of log file name patterns to find in the logFolder. '*' is the
+     * only matching character allowed. Example format: jobExecution*.log or
+     * *mylog*.txt.
+     */
+    @JsonProperty(value = "logFilePatterns", access = JsonProperty.Access.WRITE_ONLY)
+    private List<String> logFilePatterns;
+
+    /**
+     * the recurring job relationship information properties.
+     */
+    @JsonProperty(value = "related")
+    private JobRelationshipProperties related;
+
+    /**
+     * Get the job's unique identifier (a GUID).
+     *
+     * @return the jobId value
+     */
+    public UUID jobId() {
+        return this.jobId;
+    }
+
+    /**
+     * Get the friendly name of the job.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the friendly name of the job.
+     *
+     * @param name the name value to set
+     * @return the JobInformationBasic object itself.
+     */
+    public JobInformationBasic withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @return the type value
+     */
+    public JobType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the job type of the current job (Hive or USql). Possible values include: 'USql', 'Hive'.
+     *
+     * @param type the type value to set
+     * @return the JobInformationBasic object itself.
+     */
+    public JobInformationBasic withType(JobType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the user or account that submitted the job.
+     *
+     * @return the submitter value
+     */
+    public String submitter() {
+        return this.submitter;
+    }
+
+    /**
+     * Get the degree of parallelism used for this job.
+     *
+     * @return the degreeOfParallelism value
+     */
+    public Integer degreeOfParallelism() {
+        return this.degreeOfParallelism;
+    }
+
+    /**
+     * Get the degree of parallelism in percentage used for this job.
+     *
+     * @return the degreeOfParallelismPercent value
+     */
+    public Double degreeOfParallelismPercent() {
+        return this.degreeOfParallelismPercent;
+    }
+
+    /**
+     * Get the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Get the time the job was submitted to the service.
+     *
+     * @return the submitTime value
+     */
+    public DateTime submitTime() {
+        return this.submitTime;
+    }
+
+    /**
+     * Get the start time of the job.
+     *
+     * @return the startTime value
+     */
+    public DateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Get the completion time of the job.
+     *
+     * @return the endTime value
+     */
+    public DateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Get the job state. When the job is in the Ended state, refer to Result and ErrorMessage for details. Possible values include: 'Accepted', 'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling', 'Starting', 'Paused', 'WaitingForCapacity'.
+     *
+     * @return the state value
+     */
+    public JobState state() {
+        return this.state;
+    }
+
+    /**
+     * Get the result of job execution or the current result of the running job. Possible values include: 'None', 'Succeeded', 'Cancelled', 'Failed'.
+     *
+     * @return the result value
+     */
+    public JobResult result() {
+        return this.result;
+    }
+
+    /**
+     * Get the log folder path to use in the following format: adl://&lt;accountName&gt;.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/.
+     *
+     * @return the logFolder value
+     */
+    public String logFolder() {
+        return this.logFolder;
+    }
+
+    /**
+     * Get the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt.
+     *
+     * @return the logFilePatterns value
+     */
+    public List<String> logFilePatterns() {
+        return this.logFilePatterns;
+    }
+
+    /**
+     * Get the recurring job relationship information properties.
+     *
+     * @return the related value
+     */
+    public JobRelationshipProperties related() {
+        return this.related;
+    }
+
+    /**
+     * Set the recurring job relationship information properties.
+     *
+     * @param related the related value to set
+     * @return the JobInformationBasic object itself.
+     */
+    public JobInformationBasic withRelated(JobRelationshipProperties related) {
+        this.related = related;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInnerError.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInnerError.java
new file mode 100644
index 000000000000..d73777de5c35
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobInnerError.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics job error details.
+ */
+public class JobInnerError {
+    /**
+     * Gets the diagnostic error code.
+     */
+    @JsonProperty(value = "diagnosticCode", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer diagnosticCode;
+
+    /**
+     * Gets the severity level of the failure. Possible values include:
+     * 'Warning', 'Error'.
+     */
+    @JsonProperty(value = "severity", access = JsonProperty.Access.WRITE_ONLY)
+    private SeverityTypes severity;
+
+    /**
+     * Gets the details of the error message.
+     */
+    @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
+    private String details;
+
+    /**
+     * Gets the component that failed.
+     */
+    @JsonProperty(value = "component", access = JsonProperty.Access.WRITE_ONLY)
+    private String component;
+
+    /**
+     * Gets the specific identifier for the type of error encountered in the
+     * job.
+     */
+    @JsonProperty(value = "errorId", access = JsonProperty.Access.WRITE_ONLY)
+    private String errorId;
+
+    /**
+     * Gets the link to MSDN or Azure help for this type of error, if any.
+     */
+    @JsonProperty(value = "helpLink", access = JsonProperty.Access.WRITE_ONLY)
+    private String helpLink;
+
+    /**
+     * Gets the internal diagnostic stack trace if the user requesting the job
+     * error details has sufficient permissions it will be retrieved, otherwise
+     * it will be empty.
+     */
+    @JsonProperty(value = "internalDiagnostics", access = JsonProperty.Access.WRITE_ONLY)
+    private String internalDiagnostics;
+
+    /**
+     * Gets the user friendly error message for the failure.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Gets the recommended resolution for the failure, if any.
+     */
+    @JsonProperty(value = "resolution", access = JsonProperty.Access.WRITE_ONLY)
+    private String resolution;
+
+    /**
+     * Gets the ultimate source of the failure (usually either SYSTEM or USER).
+     */
+    @JsonProperty(value = "source", access = JsonProperty.Access.WRITE_ONLY)
+    private String source;
+
+    /**
+     * Gets the error message description.
+     */
+    @JsonProperty(value = "description", access = JsonProperty.Access.WRITE_ONLY)
+    private String description;
+
+    /**
+     * Get gets the diagnostic error code.
+     *
+     * @return the diagnosticCode value
+     */
+    public Integer diagnosticCode() {
+        return this.diagnosticCode;
+    }
+
+    /**
+     * Get gets the severity level of the failure. Possible values include: 'Warning', 'Error'.
+     *
+     * @return the severity value
+     */
+    public SeverityTypes severity() {
+        return this.severity;
+    }
+
+    /**
+     * Get gets the details of the error message.
+     *
+     * @return the details value
+     */
+    public String details() {
+        return this.details;
+    }
+
+    /**
+     * Get gets the component that failed.
+     *
+     * @return the component value
+     */
+    public String component() {
+        return this.component;
+    }
+
+    /**
+     * Get gets the specific identifier for the type of error encountered in the job.
+     *
+     * @return the errorId value
+     */
+    public String errorId() {
+        return this.errorId;
+    }
+
+    /**
+     * Get gets the link to MSDN or Azure help for this type of error, if any.
+     *
+     * @return the helpLink value
+     */
+    public String helpLink() {
+        return this.helpLink;
+    }
+
+    /**
+     * Get gets the internal diagnostic stack trace if the user requesting the job error details has sufficient permissions it will be retrieved, otherwise it will be empty.
+     *
+     * @return the internalDiagnostics value
+     */
+    public String internalDiagnostics() {
+        return this.internalDiagnostics;
+    }
+
+    /**
+     * Get gets the user friendly error message for the failure.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get gets the recommended resolution for the failure, if any.
+     *
+     * @return the resolution value
+     */
+    public String resolution() {
+        return this.resolution;
+    }
+
+    /**
+     * Get gets the ultimate source of the failure (usually either SYSTEM or USER).
+     *
+     * @return the source value
+     */
+    public String source() {
+        return this.source;
+    }
+
+    /**
+     * Get gets the error message description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineInformation.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineInformation.java
new file mode 100644
index 000000000000..7e45a4ba9b94
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineInformation.java
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Job Pipeline Information, showing the relationship of jobs and recurrences
+ * of those jobs in a pipeline.
+ */
+public class JobPipelineInformation {
+    /**
+     * the job relationship pipeline identifier (a GUID).
+     */
+    @JsonProperty(value = "pipelineId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID pipelineId;
+
+    /**
+     * the friendly name of the job relationship pipeline, which does not need
+     * to be unique.
+     */
+    @JsonProperty(value = "pipelineName", access = JsonProperty.Access.WRITE_ONLY)
+    private String pipelineName;
+
+    /**
+     * the pipeline uri, unique, links to the originating service for this
+     * pipeline.
+     */
+    @JsonProperty(value = "pipelineUri", access = JsonProperty.Access.WRITE_ONLY)
+    private String pipelineUri;
+
+    /**
+     * the number of jobs in this pipeline that have failed.
+     */
+    @JsonProperty(value = "numJobsFailed", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsFailed;
+
+    /**
+     * the number of jobs in this pipeline that have been canceled.
+     */
+    @JsonProperty(value = "numJobsCanceled", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsCanceled;
+
+    /**
+     * the number of jobs in this pipeline that have succeeded.
+     */
+    @JsonProperty(value = "numJobsSucceeded", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsSucceeded;
+
+    /**
+     * the number of job execution hours that resulted in failed jobs.
+     */
+    @JsonProperty(value = "auHoursFailed", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursFailed;
+
+    /**
+     * the number of job execution hours that resulted in canceled jobs.
+     */
+    @JsonProperty(value = "auHoursCanceled", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursCanceled;
+
+    /**
+     * the number of job execution hours that resulted in successful jobs.
+     */
+    @JsonProperty(value = "auHoursSucceeded", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursSucceeded;
+
+    /**
+     * the last time a job in this pipeline was submitted.
+     */
+    @JsonProperty(value = "lastSubmitTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastSubmitTime;
+
+    /**
+     * the list of run identifiers representing each run of this pipeline.
+     */
+    @JsonProperty(value = "runs", access = JsonProperty.Access.WRITE_ONLY)
+    private List<JobPipelineRunInformation> runs;
+
+    /**
+     * the list of recurrence identifiers representing each recurrence in this
+     * pipeline.
+     */
+    @JsonProperty(value = "recurrences", access = JsonProperty.Access.WRITE_ONLY)
+    private List<UUID> recurrences;
+
+    /**
+     * Get the job relationship pipeline identifier (a GUID).
+     *
+     * @return the pipelineId value
+     */
+    public UUID pipelineId() {
+        return this.pipelineId;
+    }
+
+    /**
+     * Get the friendly name of the job relationship pipeline, which does not need to be unique.
+     *
+     * @return the pipelineName value
+     */
+    public String pipelineName() {
+        return this.pipelineName;
+    }
+
+    /**
+     * Get the pipeline uri, unique, links to the originating service for this pipeline.
+     *
+     * @return the pipelineUri value
+     */
+    public String pipelineUri() {
+        return this.pipelineUri;
+    }
+
+    /**
+     * Get the number of jobs in this pipeline that have failed.
+     *
+     * @return the numJobsFailed value
+     */
+    public Integer numJobsFailed() {
+        return this.numJobsFailed;
+    }
+
+    /**
+     * Get the number of jobs in this pipeline that have been canceled.
+     *
+     * @return the numJobsCanceled value
+     */
+    public Integer numJobsCanceled() {
+        return this.numJobsCanceled;
+    }
+
+    /**
+     * Get the number of jobs in this pipeline that have succeeded.
+     *
+     * @return the numJobsSucceeded value
+     */
+    public Integer numJobsSucceeded() {
+        return this.numJobsSucceeded;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in failed jobs.
+     *
+     * @return the auHoursFailed value
+     */
+    public Double auHoursFailed() {
+        return this.auHoursFailed;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in canceled jobs.
+     *
+     * @return the auHoursCanceled value
+     */
+    public Double auHoursCanceled() {
+        return this.auHoursCanceled;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in successful jobs.
+     *
+     * @return the auHoursSucceeded value
+     */
+    public Double auHoursSucceeded() {
+        return this.auHoursSucceeded;
+    }
+
+    /**
+     * Get the last time a job in this pipeline was submitted.
+     *
+     * @return the lastSubmitTime value
+     */
+    public DateTime lastSubmitTime() {
+        return this.lastSubmitTime;
+    }
+
+    /**
+     * Get the list of run identifiers representing each run of this pipeline.
+     *
+     * @return the runs value
+     */
+    public List<JobPipelineRunInformation> runs() {
+        return this.runs;
+    }
+
+    /**
+     * Get the list of recurrence identifiers representing each recurrence in this pipeline.
+     *
+     * @return the recurrences value
+     */
+    public List<UUID> recurrences() {
+        return this.recurrences;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineRunInformation.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineRunInformation.java
new file mode 100644
index 000000000000..66549c890405
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobPipelineRunInformation.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Run info for a specific job pipeline.
+ */
+public class JobPipelineRunInformation {
+    /**
+     * the run identifier of an instance of pipeline executions (a GUID).
+     */
+    @JsonProperty(value = "runId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID runId;
+
+    /**
+     * the time this instance was last submitted.
+     */
+    @JsonProperty(value = "lastSubmitTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastSubmitTime;
+
+    /**
+     * Get the run identifier of an instance of pipeline executions (a GUID).
+     *
+     * @return the runId value
+     */
+    public UUID runId() {
+        return this.runId;
+    }
+
+    /**
+     * Get the time this instance was last submitted.
+     *
+     * @return the lastSubmitTime value
+     */
+    public DateTime lastSubmitTime() {
+        return this.lastSubmitTime;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobProperties.java
new file mode 100644
index 000000000000..cff29061fcd1
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobProperties.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+
+/**
+ * The common Data Lake Analytics job properties.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("JobProperties")
+@JsonSubTypes({
+    @JsonSubTypes.Type(name = "USql", value = USqlJobProperties.class),
+    @JsonSubTypes.Type(name = "Hive", value = HiveJobProperties.class)
+})
+public class JobProperties {
+    /**
+     * Gets or sets the runtime version of the U-SQL engine to use.
+     */
+    @JsonProperty(value = "runtimeVersion")
+    private String runtimeVersion;
+
+    /**
+     * Gets or sets the U-SQL script to run.
+     */
+    @JsonProperty(value = "script", required = true)
+    private String script;
+
+    /**
+     * Get gets or sets the runtime version of the U-SQL engine to use.
+     *
+     * @return the runtimeVersion value
+     */
+    public String runtimeVersion() {
+        return this.runtimeVersion;
+    }
+
+    /**
+     * Set gets or sets the runtime version of the U-SQL engine to use.
+     *
+     * @param runtimeVersion the runtimeVersion value to set
+     * @return the JobProperties object itself.
+     */
+    public JobProperties withRuntimeVersion(String runtimeVersion) {
+        this.runtimeVersion = runtimeVersion;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the U-SQL script to run.
+     *
+     * @return the script value
+     */
+    public String script() {
+        return this.script;
+    }
+
+    /**
+     * Set gets or sets the U-SQL script to run.
+     *
+     * @param script the script value to set
+     * @return the JobProperties object itself.
+     */
+    public JobProperties withScript(String script) {
+        this.script = script;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRecurrenceInformation.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRecurrenceInformation.java
new file mode 100644
index 000000000000..8f80436ff538
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRecurrenceInformation.java
@@ -0,0 +1,157 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Recurrence job information for a specific recurrence.
+ */
+public class JobRecurrenceInformation {
+    /**
+     * the recurrence identifier (a GUID), unique per activity/script,
+     * regardless of iterations. This is something to link different
+     * occurrences of the same job together.
+     */
+    @JsonProperty(value = "recurrenceId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID recurrenceId;
+
+    /**
+     * the recurrence name, user friendly name for the correlation between
+     * jobs.
+     */
+    @JsonProperty(value = "recurrenceName", access = JsonProperty.Access.WRITE_ONLY)
+    private String recurrenceName;
+
+    /**
+     * the number of jobs in this recurrence that have failed.
+     */
+    @JsonProperty(value = "numJobsFailed", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsFailed;
+
+    /**
+     * the number of jobs in this recurrence that have been canceled.
+     */
+    @JsonProperty(value = "numJobsCanceled", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsCanceled;
+
+    /**
+     * the number of jobs in this recurrence that have succeeded.
+     */
+    @JsonProperty(value = "numJobsSucceeded", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer numJobsSucceeded;
+
+    /**
+     * the number of job execution hours that resulted in failed jobs.
+     */
+    @JsonProperty(value = "auHoursFailed", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursFailed;
+
+    /**
+     * the number of job execution hours that resulted in canceled jobs.
+     */
+    @JsonProperty(value = "auHoursCanceled", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursCanceled;
+
+    /**
+     * the number of job execution hours that resulted in successful jobs.
+     */
+    @JsonProperty(value = "auHoursSucceeded", access = JsonProperty.Access.WRITE_ONLY)
+    private Double auHoursSucceeded;
+
+    /**
+     * the last time a job in this recurrence was submitted.
+     */
+    @JsonProperty(value = "lastSubmitTime", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastSubmitTime;
+
+    /**
+     * Get the recurrence identifier (a GUID), unique per activity/script, regardless of iterations. This is something to link different occurrences of the same job together.
+     *
+     * @return the recurrenceId value
+     */
+    public UUID recurrenceId() {
+        return this.recurrenceId;
+    }
+
+    /**
+     * Get the recurrence name, user friendly name for the correlation between jobs.
+     *
+     * @return the recurrenceName value
+     */
+    public String recurrenceName() {
+        return this.recurrenceName;
+    }
+
+    /**
+     * Get the number of jobs in this recurrence that have failed.
+     *
+     * @return the numJobsFailed value
+     */
+    public Integer numJobsFailed() {
+        return this.numJobsFailed;
+    }
+
+    /**
+     * Get the number of jobs in this recurrence that have been canceled.
+     *
+     * @return the numJobsCanceled value
+     */
+    public Integer numJobsCanceled() {
+        return this.numJobsCanceled;
+    }
+
+    /**
+     * Get the number of jobs in this recurrence that have succeeded.
+     *
+     * @return the numJobsSucceeded value
+     */
+    public Integer numJobsSucceeded() {
+        return this.numJobsSucceeded;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in failed jobs.
+     *
+     * @return the auHoursFailed value
+     */
+    public Double auHoursFailed() {
+        return this.auHoursFailed;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in canceled jobs.
+     *
+     * @return the auHoursCanceled value
+     */
+    public Double auHoursCanceled() {
+        return this.auHoursCanceled;
+    }
+
+    /**
+     * Get the number of job execution hours that resulted in successful jobs.
+     *
+     * @return the auHoursSucceeded value
+     */
+    public Double auHoursSucceeded() {
+        return this.auHoursSucceeded;
+    }
+
+    /**
+     * Get the last time a job in this recurrence was submitted.
+     *
+     * @return the lastSubmitTime value
+     */
+    public DateTime lastSubmitTime() {
+        return this.lastSubmitTime;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRelationshipProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRelationshipProperties.java
new file mode 100644
index 000000000000..791184875c19
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobRelationshipProperties.java
@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Job relationship information properties including pipeline information,
+ * correlation information, etc.
+ */
+public class JobRelationshipProperties {
+    /**
+     * the job relationship pipeline identifier (a GUID).
+     */
+    @JsonProperty(value = "pipelineId")
+    private UUID pipelineId;
+
+    /**
+     * the friendly name of the job relationship pipeline, which does not need
+     * to be unique.
+     */
+    @JsonProperty(value = "pipelineName")
+    private String pipelineName;
+
+    /**
+     * the pipeline uri, unique, links to the originating service for this
+     * pipeline.
+     */
+    @JsonProperty(value = "pipelineUri")
+    private String pipelineUri;
+
+    /**
+     * the run identifier (a GUID), unique identifier of the iteration of this
+     * pipeline.
+     */
+    @JsonProperty(value = "runId")
+    private UUID runId;
+
+    /**
+     * the recurrence identifier (a GUID), unique per activity/script,
+     * regardless of iterations. This is something to link different
+     * occurrences of the same job together.
+     */
+    @JsonProperty(value = "recurrenceId", required = true)
+    private UUID recurrenceId;
+
+    /**
+     * the recurrence name, user friendly name for the correlation between
+     * jobs.
+     */
+    @JsonProperty(value = "recurrenceName")
+    private String recurrenceName;
+
+    /**
+     * Get the job relationship pipeline identifier (a GUID).
+     *
+     * @return the pipelineId value
+     */
+    public UUID pipelineId() {
+        return this.pipelineId;
+    }
+
+    /**
+     * Set the job relationship pipeline identifier (a GUID).
+     *
+     * @param pipelineId the pipelineId value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withPipelineId(UUID pipelineId) {
+        this.pipelineId = pipelineId;
+        return this;
+    }
+
+    /**
+     * Get the friendly name of the job relationship pipeline, which does not need to be unique.
+     *
+     * @return the pipelineName value
+     */
+    public String pipelineName() {
+        return this.pipelineName;
+    }
+
+    /**
+     * Set the friendly name of the job relationship pipeline, which does not need to be unique.
+     *
+     * @param pipelineName the pipelineName value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withPipelineName(String pipelineName) {
+        this.pipelineName = pipelineName;
+        return this;
+    }
+
+    /**
+     * Get the pipeline uri, unique, links to the originating service for this pipeline.
+     *
+     * @return the pipelineUri value
+     */
+    public String pipelineUri() {
+        return this.pipelineUri;
+    }
+
+    /**
+     * Set the pipeline uri, unique, links to the originating service for this pipeline.
+     *
+     * @param pipelineUri the pipelineUri value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withPipelineUri(String pipelineUri) {
+        this.pipelineUri = pipelineUri;
+        return this;
+    }
+
+    /**
+     * Get the run identifier (a GUID), unique identifier of the iteration of this pipeline.
+     *
+     * @return the runId value
+     */
+    public UUID runId() {
+        return this.runId;
+    }
+
+    /**
+     * Set the run identifier (a GUID), unique identifier of the iteration of this pipeline.
+     *
+     * @param runId the runId value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withRunId(UUID runId) {
+        this.runId = runId;
+        return this;
+    }
+
+    /**
+     * Get the recurrence identifier (a GUID), unique per activity/script, regardless of iterations. This is something to link different occurrences of the same job together.
+     *
+     * @return the recurrenceId value
+     */
+    public UUID recurrenceId() {
+        return this.recurrenceId;
+    }
+
+    /**
+     * Set the recurrence identifier (a GUID), unique per activity/script, regardless of iterations. This is something to link different occurrences of the same job together.
+     *
+     * @param recurrenceId the recurrenceId value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withRecurrenceId(UUID recurrenceId) {
+        this.recurrenceId = recurrenceId;
+        return this;
+    }
+
+    /**
+     * Get the recurrence name, user friendly name for the correlation between jobs.
+     *
+     * @return the recurrenceName value
+     */
+    public String recurrenceName() {
+        return this.recurrenceName;
+    }
+
+    /**
+     * Set the recurrence name, user friendly name for the correlation between jobs.
+     *
+     * @param recurrenceName the recurrenceName value to set
+     * @return the JobRelationshipProperties object itself.
+     */
+    public JobRelationshipProperties withRecurrenceName(String recurrenceName) {
+        this.recurrenceName = recurrenceName;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResource.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResource.java
new file mode 100644
index 000000000000..d160aef9a6d4
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResource.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics U-SQL job resources.
+ */
+public class JobResource {
+    /**
+     * Gets or set the name of the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Gets or sets the path to the resource.
+     */
+    @JsonProperty(value = "resourcePath")
+    private String resourcePath;
+
+    /**
+     * Gets or sets the job resource type. Possible values include:
+     * 'VertexResource', 'StatisticsResource'.
+     */
+    @JsonProperty(value = "type")
+    private JobResourceType type;
+
+    /**
+     * Get gets or set the name of the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set gets or set the name of the resource.
+     *
+     * @param name the name value to set
+     * @return the JobResource object itself.
+     */
+    public JobResource withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the path to the resource.
+     *
+     * @return the resourcePath value
+     */
+    public String resourcePath() {
+        return this.resourcePath;
+    }
+
+    /**
+     * Set gets or sets the path to the resource.
+     *
+     * @param resourcePath the resourcePath value to set
+     * @return the JobResource object itself.
+     */
+    public JobResource withResourcePath(String resourcePath) {
+        this.resourcePath = resourcePath;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the job resource type. Possible values include: 'VertexResource', 'StatisticsResource'.
+     *
+     * @return the type value
+     */
+    public JobResourceType type() {
+        return this.type;
+    }
+
+    /**
+     * Set gets or sets the job resource type. Possible values include: 'VertexResource', 'StatisticsResource'.
+     *
+     * @param type the type value to set
+     * @return the JobResource object itself.
+     */
+    public JobResource withType(JobResourceType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResourceType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResourceType.java
new file mode 100644
index 000000000000..72cb6c4ee053
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResourceType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for JobResourceType.
+ */
+public enum JobResourceType {
+    /** Enum value VertexResource. */
+    VERTEX_RESOURCE("VertexResource"),
+
+    /** Enum value StatisticsResource. */
+    STATISTICS_RESOURCE("StatisticsResource");
+
+    /** The actual serialized value for a JobResourceType instance. */
+    private String value;
+
+    JobResourceType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a JobResourceType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed JobResourceType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static JobResourceType fromString(String value) {
+        JobResourceType[] items = JobResourceType.values();
+        for (JobResourceType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResult.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResult.java
new file mode 100644
index 000000000000..adf3c463431d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobResult.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for JobResult.
+ */
+public enum JobResult {
+    /** Enum value None. */
+    NONE("None"),
+
+    /** Enum value Succeeded. */
+    SUCCEEDED("Succeeded"),
+
+    /** Enum value Cancelled. */
+    CANCELLED("Cancelled"),
+
+    /** Enum value Failed. */
+    FAILED("Failed");
+
+    /** The actual serialized value for a JobResult instance. */
+    private String value;
+
+    JobResult(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a JobResult instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed JobResult object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static JobResult fromString(String value) {
+        JobResult[] items = JobResult.values();
+        for (JobResult item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobState.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobState.java
new file mode 100644
index 000000000000..0403554c8a54
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobState.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for JobState.
+ */
+public enum JobState {
+    /** Enum value Accepted. */
+    ACCEPTED("Accepted"),
+
+    /** Enum value Compiling. */
+    COMPILING("Compiling"),
+
+    /** Enum value Ended. */
+    ENDED("Ended"),
+
+    /** Enum value New. */
+    NEW("New"),
+
+    /** Enum value Queued. */
+    QUEUED("Queued"),
+
+    /** Enum value Running. */
+    RUNNING("Running"),
+
+    /** Enum value Scheduling. */
+    SCHEDULING("Scheduling"),
+
+    /** Enum value Starting. */
+    STARTING("Starting"),
+
+    /** Enum value Paused. */
+    PAUSED("Paused"),
+
+    /** Enum value WaitingForCapacity. */
+    WAITING_FOR_CAPACITY("WaitingForCapacity");
+
+    /** The actual serialized value for a JobState instance. */
+    private String value;
+
+    JobState(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a JobState instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed JobState object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static JobState fromString(String value) {
+        JobState[] items = JobState.values();
+        for (JobState item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStateAuditRecord.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStateAuditRecord.java
new file mode 100644
index 000000000000..36b3b23c137e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStateAuditRecord.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics U-SQL job state audit records for tracking the
+ * lifecycle of a job.
+ */
+public class JobStateAuditRecord {
+    /**
+     * Gets the new state the job is in.
+     */
+    @JsonProperty(value = "newState", access = JsonProperty.Access.WRITE_ONLY)
+    private String newState;
+
+    /**
+     * Gets the time stamp that the state change took place.
+     */
+    @JsonProperty(value = "timeStamp", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime timeStamp;
+
+    /**
+     * Gets the user who requests the change.
+     */
+    @JsonProperty(value = "requestedByUser", access = JsonProperty.Access.WRITE_ONLY)
+    private String requestedByUser;
+
+    /**
+     * Gets  the details of the audit log.
+     */
+    @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
+    private String details;
+
+    /**
+     * Get gets the new state the job is in.
+     *
+     * @return the newState value
+     */
+    public String newState() {
+        return this.newState;
+    }
+
+    /**
+     * Get gets the time stamp that the state change took place.
+     *
+     * @return the timeStamp value
+     */
+    public DateTime timeStamp() {
+        return this.timeStamp;
+    }
+
+    /**
+     * Get gets the user who requests the change.
+     *
+     * @return the requestedByUser value
+     */
+    public String requestedByUser() {
+        return this.requestedByUser;
+    }
+
+    /**
+     * Get gets  the details of the audit log.
+     *
+     * @return the details value
+     */
+    public String details() {
+        return this.details;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatistics.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatistics.java
new file mode 100644
index 000000000000..9c043e062367
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatistics.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics U-SQL job execution statistics.
+ */
+public class JobStatistics {
+    /**
+     * Gets the last update time for the statistics.
+     */
+    @JsonProperty(value = "lastUpdateTimeUtc", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime lastUpdateTimeUtc;
+
+    /**
+     * Gets the list of stages for the job.
+     */
+    @JsonProperty(value = "stages", access = JsonProperty.Access.WRITE_ONLY)
+    private List<JobStatisticsVertexStage> stages;
+
+    /**
+     * Get gets the last update time for the statistics.
+     *
+     * @return the lastUpdateTimeUtc value
+     */
+    public DateTime lastUpdateTimeUtc() {
+        return this.lastUpdateTimeUtc;
+    }
+
+    /**
+     * Get gets the list of stages for the job.
+     *
+     * @return the stages value
+     */
+    public List<JobStatisticsVertexStage> stages() {
+        return this.stages;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertex.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertex.java
new file mode 100644
index 000000000000..894af7ea8ccd
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertex.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.Period;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The detailed information for a vertex.
+ */
+public class JobStatisticsVertex {
+    /**
+     * The name of the vertex.
+     */
+    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    private String name;
+
+    /**
+     * The id of the vertex.
+     */
+    @JsonProperty(value = "vertexId", access = JsonProperty.Access.WRITE_ONLY)
+    private UUID vertexId;
+
+    /**
+     * The amount of execution time of the vertex.
+     */
+    @JsonProperty(value = "executionTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Period executionTime;
+
+    /**
+     * The amount of data read of the vertex, in bytes.
+     */
+    @JsonProperty(value = "dataRead", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataRead;
+
+    /**
+     * The amount of peak memory usage of the vertex, in bytes.
+     */
+    @JsonProperty(value = "peakMemUsage", access = JsonProperty.Access.WRITE_ONLY)
+    private Long peakMemUsage;
+
+    /**
+     * Get the name of the vertex.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id of the vertex.
+     *
+     * @return the vertexId value
+     */
+    public UUID vertexId() {
+        return this.vertexId;
+    }
+
+    /**
+     * Get the amount of execution time of the vertex.
+     *
+     * @return the executionTime value
+     */
+    public Period executionTime() {
+        return this.executionTime;
+    }
+
+    /**
+     * Get the amount of data read of the vertex, in bytes.
+     *
+     * @return the dataRead value
+     */
+    public Long dataRead() {
+        return this.dataRead;
+    }
+
+    /**
+     * Get the amount of peak memory usage of the vertex, in bytes.
+     *
+     * @return the peakMemUsage value
+     */
+    public Long peakMemUsage() {
+        return this.peakMemUsage;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertexStage.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertexStage.java
new file mode 100644
index 000000000000..e0ae48a2cb9d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobStatisticsVertexStage.java
@@ -0,0 +1,317 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Data Lake Analytics U-SQL job statistics vertex stage information.
+ */
+public class JobStatisticsVertexStage {
+    /**
+     * Gets the amount of data read, in bytes.
+     */
+    @JsonProperty(value = "dataRead", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataRead;
+
+    /**
+     * Gets the amount of data read across multiple pods, in bytes.
+     */
+    @JsonProperty(value = "dataReadCrossPod", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataReadCrossPod;
+
+    /**
+     * Gets the amount of data read in one pod, in bytes.
+     */
+    @JsonProperty(value = "dataReadIntraPod", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataReadIntraPod;
+
+    /**
+     * Gets the amount of data remaining to be read, in bytes.
+     */
+    @JsonProperty(value = "dataToRead", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataToRead;
+
+    /**
+     * Gets the amount of data written, in bytes.
+     */
+    @JsonProperty(value = "dataWritten", access = JsonProperty.Access.WRITE_ONLY)
+    private Long dataWritten;
+
+    /**
+     * Gets the number of duplicates that were discarded.
+     */
+    @JsonProperty(value = "duplicateDiscardCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer duplicateDiscardCount;
+
+    /**
+     * Gets the number of failures that occured in this stage.
+     */
+    @JsonProperty(value = "failedCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer failedCount;
+
+    /**
+     * Gets the maximum amount of data read in a single vertex, in bytes.
+     */
+    @JsonProperty(value = "maxVertexDataRead", access = JsonProperty.Access.WRITE_ONLY)
+    private Long maxVertexDataRead;
+
+    /**
+     * Gets the minimum amount of data read in a single vertex, in bytes.
+     */
+    @JsonProperty(value = "minVertexDataRead", access = JsonProperty.Access.WRITE_ONLY)
+    private Long minVertexDataRead;
+
+    /**
+     * Gets the number of read failures in this stage.
+     */
+    @JsonProperty(value = "readFailureCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer readFailureCount;
+
+    /**
+     * Gets the number of vertices that were revoked during this stage.
+     */
+    @JsonProperty(value = "revocationCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer revocationCount;
+
+    /**
+     * Gets the number of currently running vertices in this stage.
+     */
+    @JsonProperty(value = "runningCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer runningCount;
+
+    /**
+     * Gets the number of currently scheduled vertices in this stage.
+     */
+    @JsonProperty(value = "scheduledCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer scheduledCount;
+
+    /**
+     * Gets the name of this stage in job execution.
+     */
+    @JsonProperty(value = "stageName", access = JsonProperty.Access.WRITE_ONLY)
+    private String stageName;
+
+    /**
+     * Gets the number of vertices that succeeded in this stage.
+     */
+    @JsonProperty(value = "succeededCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer succeededCount;
+
+    /**
+     * Gets the amount of temporary data written, in bytes.
+     */
+    @JsonProperty(value = "tempDataWritten", access = JsonProperty.Access.WRITE_ONLY)
+    private Long tempDataWritten;
+
+    /**
+     * Gets the total vertex count for this stage.
+     */
+    @JsonProperty(value = "totalCount", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer totalCount;
+
+    /**
+     * Gets the amount of time that failed vertices took up in this stage.
+     */
+    @JsonProperty(value = "totalFailedTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalFailedTime;
+
+    /**
+     * Gets the current progress of this stage, as a percentage.
+     */
+    @JsonProperty(value = "totalProgress", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer totalProgress;
+
+    /**
+     * Gets the amount of time all successful vertices took in this stage.
+     */
+    @JsonProperty(value = "totalSucceededTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalSucceededTime;
+
+    /**
+     * Get gets the amount of data read, in bytes.
+     *
+     * @return the dataRead value
+     */
+    public Long dataRead() {
+        return this.dataRead;
+    }
+
+    /**
+     * Get gets the amount of data read across multiple pods, in bytes.
+     *
+     * @return the dataReadCrossPod value
+     */
+    public Long dataReadCrossPod() {
+        return this.dataReadCrossPod;
+    }
+
+    /**
+     * Get gets the amount of data read in one pod, in bytes.
+     *
+     * @return the dataReadIntraPod value
+     */
+    public Long dataReadIntraPod() {
+        return this.dataReadIntraPod;
+    }
+
+    /**
+     * Get gets the amount of data remaining to be read, in bytes.
+     *
+     * @return the dataToRead value
+     */
+    public Long dataToRead() {
+        return this.dataToRead;
+    }
+
+    /**
+     * Get gets the amount of data written, in bytes.
+     *
+     * @return the dataWritten value
+     */
+    public Long dataWritten() {
+        return this.dataWritten;
+    }
+
+    /**
+     * Get gets the number of duplicates that were discarded.
+     *
+     * @return the duplicateDiscardCount value
+     */
+    public Integer duplicateDiscardCount() {
+        return this.duplicateDiscardCount;
+    }
+
+    /**
+     * Get gets the number of failures that occured in this stage.
+     *
+     * @return the failedCount value
+     */
+    public Integer failedCount() {
+        return this.failedCount;
+    }
+
+    /**
+     * Get gets the maximum amount of data read in a single vertex, in bytes.
+     *
+     * @return the maxVertexDataRead value
+     */
+    public Long maxVertexDataRead() {
+        return this.maxVertexDataRead;
+    }
+
+    /**
+     * Get gets the minimum amount of data read in a single vertex, in bytes.
+     *
+     * @return the minVertexDataRead value
+     */
+    public Long minVertexDataRead() {
+        return this.minVertexDataRead;
+    }
+
+    /**
+     * Get gets the number of read failures in this stage.
+     *
+     * @return the readFailureCount value
+     */
+    public Integer readFailureCount() {
+        return this.readFailureCount;
+    }
+
+    /**
+     * Get gets the number of vertices that were revoked during this stage.
+     *
+     * @return the revocationCount value
+     */
+    public Integer revocationCount() {
+        return this.revocationCount;
+    }
+
+    /**
+     * Get gets the number of currently running vertices in this stage.
+     *
+     * @return the runningCount value
+     */
+    public Integer runningCount() {
+        return this.runningCount;
+    }
+
+    /**
+     * Get gets the number of currently scheduled vertices in this stage.
+     *
+     * @return the scheduledCount value
+     */
+    public Integer scheduledCount() {
+        return this.scheduledCount;
+    }
+
+    /**
+     * Get gets the name of this stage in job execution.
+     *
+     * @return the stageName value
+     */
+    public String stageName() {
+        return this.stageName;
+    }
+
+    /**
+     * Get gets the number of vertices that succeeded in this stage.
+     *
+     * @return the succeededCount value
+     */
+    public Integer succeededCount() {
+        return this.succeededCount;
+    }
+
+    /**
+     * Get gets the amount of temporary data written, in bytes.
+     *
+     * @return the tempDataWritten value
+     */
+    public Long tempDataWritten() {
+        return this.tempDataWritten;
+    }
+
+    /**
+     * Get gets the total vertex count for this stage.
+     *
+     * @return the totalCount value
+     */
+    public Integer totalCount() {
+        return this.totalCount;
+    }
+
+    /**
+     * Get gets the amount of time that failed vertices took up in this stage.
+     *
+     * @return the totalFailedTime value
+     */
+    public String totalFailedTime() {
+        return this.totalFailedTime;
+    }
+
+    /**
+     * Get gets the current progress of this stage, as a percentage.
+     *
+     * @return the totalProgress value
+     */
+    public Integer totalProgress() {
+        return this.totalProgress;
+    }
+
+    /**
+     * Get gets the amount of time all successful vertices took in this stage.
+     *
+     * @return the totalSucceededTime value
+     */
+    public String totalSucceededTime() {
+        return this.totalSucceededTime;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobType.java
new file mode 100644
index 000000000000..5cb73304d82e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/JobType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for JobType.
+ */
+public enum JobType {
+    /** Enum value USql. */
+    USQL("USql"),
+
+    /** Enum value Hive. */
+    HIVE("Hive");
+
+    /** The actual serialized value for a JobType instance. */
+    private String value;
+
+    JobType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a JobType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed JobType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static JobType fromString(String value) {
+        JobType[] items = JobType.values();
+        for (JobType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PageImpl.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PageImpl.java
new file mode 100644
index 000000000000..df7b95e40e2d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PermissionType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PermissionType.java
new file mode 100644
index 000000000000..e609feb13239
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/PermissionType.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PermissionType.
+ */
+public final class PermissionType extends ExpandableStringEnum<PermissionType> {
+    /** Static value None for PermissionType. */
+    public static final PermissionType NONE = fromString("None");
+
+    /** Static value Use for PermissionType. */
+    public static final PermissionType USE = fromString("Use");
+
+    /** Static value Create for PermissionType. */
+    public static final PermissionType CREATE = fromString("Create");
+
+    /** Static value Drop for PermissionType. */
+    public static final PermissionType DROP = fromString("Drop");
+
+    /** Static value Alter for PermissionType. */
+    public static final PermissionType ALTER = fromString("Alter");
+
+    /** Static value Write for PermissionType. */
+    public static final PermissionType WRITE = fromString("Write");
+
+    /** Static value All for PermissionType. */
+    public static final PermissionType ALL = fromString("All");
+
+    /**
+     * Creates or finds a PermissionType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PermissionType
+     */
+    @JsonCreator
+    public static PermissionType fromString(String name) {
+        return fromString(name, PermissionType.class);
+    }
+
+    /**
+     * @return known PermissionType values
+     */
+    public static Collection<PermissionType> values() {
+        return values(PermissionType.class);
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ResourceUsageStatistics.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ResourceUsageStatistics.java
new file mode 100644
index 000000000000..ffc76e82771a
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ResourceUsageStatistics.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The statistics information for resource usage.
+ */
+public class ResourceUsageStatistics {
+    /**
+     * The average value.
+     */
+    @JsonProperty(value = "average", access = JsonProperty.Access.WRITE_ONLY)
+    private Double average;
+
+    /**
+     * The minimum value.
+     */
+    @JsonProperty(value = "minimum", access = JsonProperty.Access.WRITE_ONLY)
+    private Long minimum;
+
+    /**
+     * The maximum value.
+     */
+    @JsonProperty(value = "maximum", access = JsonProperty.Access.WRITE_ONLY)
+    private Long maximum;
+
+    /**
+     * Get the average value.
+     *
+     * @return the average value
+     */
+    public Double average() {
+        return this.average;
+    }
+
+    /**
+     * Get the minimum value.
+     *
+     * @return the minimum value
+     */
+    public Long minimum() {
+        return this.minimum;
+    }
+
+    /**
+     * Get the maximum value.
+     *
+     * @return the maximum value
+     */
+    public Long maximum() {
+        return this.maximum;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobProperties.java
new file mode 100644
index 000000000000..421cdb8c9f2e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobProperties.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import org.joda.time.Period;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * Scope job properties used when submitting and retrieving Scope jobs. (Only
+ * for use internally with Scope job type.).
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("Scope")
+public class ScopeJobProperties extends JobProperties {
+    /**
+     * The list of resources that are required by the job.
+     */
+    @JsonProperty(value = "resources", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ScopeJobResource> resources;
+
+    /**
+     * The algebra file path after the job has completed.
+     */
+    @JsonProperty(value = "userAlgebraPath", access = JsonProperty.Access.WRITE_ONLY)
+    private String userAlgebraPath;
+
+    /**
+     * The list of email addresses, separated by semi-colons, to notify when
+     * the job reaches a terminal state.
+     */
+    @JsonProperty(value = "notifier")
+    private String notifier;
+
+    /**
+     * The total time this job spent compiling. This value should not be set by
+     * the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalCompilationTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Period totalCompilationTime;
+
+    /**
+     * The total time this job spent queued. This value should not be set by
+     * the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalQueuedTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Period totalQueuedTime;
+
+    /**
+     * The total time this job spent executing. This value should not be set by
+     * the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalRunningTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Period totalRunningTime;
+
+    /**
+     * The total time this job spent paused. This value should not be set by
+     * the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalPausedTime", access = JsonProperty.Access.WRITE_ONLY)
+    private Period totalPausedTime;
+
+    /**
+     * The ID used to identify the job manager coordinating job execution. This
+     * value should not be set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "rootProcessNodeId", access = JsonProperty.Access.WRITE_ONLY)
+    private String rootProcessNodeId;
+
+    /**
+     * The ID used to identify the yarn application executing the job. This
+     * value should not be set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "yarnApplicationId", access = JsonProperty.Access.WRITE_ONLY)
+    private String yarnApplicationId;
+
+    /**
+     * Get the list of resources that are required by the job.
+     *
+     * @return the resources value
+     */
+    public List<ScopeJobResource> resources() {
+        return this.resources;
+    }
+
+    /**
+     * Get the algebra file path after the job has completed.
+     *
+     * @return the userAlgebraPath value
+     */
+    public String userAlgebraPath() {
+        return this.userAlgebraPath;
+    }
+
+    /**
+     * Get the list of email addresses, separated by semi-colons, to notify when the job reaches a terminal state.
+     *
+     * @return the notifier value
+     */
+    public String notifier() {
+        return this.notifier;
+    }
+
+    /**
+     * Set the list of email addresses, separated by semi-colons, to notify when the job reaches a terminal state.
+     *
+     * @param notifier the notifier value to set
+     * @return the ScopeJobProperties object itself.
+     */
+    public ScopeJobProperties withNotifier(String notifier) {
+        this.notifier = notifier;
+        return this;
+    }
+
+    /**
+     * Get the total time this job spent compiling. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalCompilationTime value
+     */
+    public Period totalCompilationTime() {
+        return this.totalCompilationTime;
+    }
+
+    /**
+     * Get the total time this job spent queued. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalQueuedTime value
+     */
+    public Period totalQueuedTime() {
+        return this.totalQueuedTime;
+    }
+
+    /**
+     * Get the total time this job spent executing. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalRunningTime value
+     */
+    public Period totalRunningTime() {
+        return this.totalRunningTime;
+    }
+
+    /**
+     * Get the total time this job spent paused. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalPausedTime value
+     */
+    public Period totalPausedTime() {
+        return this.totalPausedTime;
+    }
+
+    /**
+     * Get the ID used to identify the job manager coordinating job execution. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the rootProcessNodeId value
+     */
+    public String rootProcessNodeId() {
+        return this.rootProcessNodeId;
+    }
+
+    /**
+     * Get the ID used to identify the yarn application executing the job. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the yarnApplicationId value
+     */
+    public String yarnApplicationId() {
+        return this.yarnApplicationId;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobResource.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobResource.java
new file mode 100644
index 000000000000..5c72a7eae6f2
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/ScopeJobResource.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The Scope job resources. (Only for use internally with Scope job type.).
+ */
+public class ScopeJobResource {
+    /**
+     * The name of the resource.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The path to the resource.
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * Get the name of the resource.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the resource.
+     *
+     * @param name the name value to set
+     * @return the ScopeJobResource object itself.
+     */
+    public ScopeJobResource withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the path to the resource.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set the path to the resource.
+     *
+     * @param path the path value to set
+     * @return the ScopeJobResource object itself.
+     */
+    public ScopeJobResource withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/SeverityTypes.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/SeverityTypes.java
new file mode 100644
index 000000000000..cb8e135c29de
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/SeverityTypes.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for SeverityTypes.
+ */
+public enum SeverityTypes {
+    /** Enum value Warning. */
+    WARNING("Warning"),
+
+    /** Enum value Error. */
+    ERROR("Error");
+
+    /** The actual serialized value for a SeverityTypes instance. */
+    private String value;
+
+    SeverityTypes(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a SeverityTypes instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed SeverityTypes object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static SeverityTypes fromString(String value) {
+        SeverityTypes[] items = SeverityTypes.values();
+        for (SeverityTypes item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/TypeFieldInfo.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/TypeFieldInfo.java
new file mode 100644
index 000000000000..240b072db3e7
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/TypeFieldInfo.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog type field information item.
+ */
+public class TypeFieldInfo {
+    /**
+     * the name of the field associated with this type.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * the type of the field.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Get the name of the field associated with this type.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the field associated with this type.
+     *
+     * @param name the name value to set
+     * @return the TypeFieldInfo object itself.
+     */
+    public TypeFieldInfo withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the type of the field.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of the field.
+     *
+     * @param type the type value to set
+     * @return the TypeFieldInfo object itself.
+     */
+    public TypeFieldInfo withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssembly.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssembly.java
new file mode 100644
index 000000000000..4d016e3de06d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssembly.java
@@ -0,0 +1,200 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL Assembly.
+ */
+public class USqlAssembly extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the assembly.
+     */
+    @JsonProperty(value = "assemblyName")
+    private String name;
+
+    /**
+     * the name of the CLR.
+     */
+    @JsonProperty(value = "clrName")
+    private String clrName;
+
+    /**
+     * the switch indicating if this assembly is visible or not.
+     */
+    @JsonProperty(value = "isVisible")
+    private Boolean isVisible;
+
+    /**
+     * the switch indicating if this assembly is user defined or not.
+     */
+    @JsonProperty(value = "isUserDefined")
+    private Boolean isUserDefined;
+
+    /**
+     * the list of files associated with the assembly.
+     */
+    @JsonProperty(value = "files")
+    private List<USqlAssemblyFileInfo> files;
+
+    /**
+     * the list of dependencies associated with the assembly.
+     */
+    @JsonProperty(value = "dependencies")
+    private List<USqlAssemblyDependencyInfo> dependencies;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the assembly.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the assembly.
+     *
+     * @param name the name value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the name of the CLR.
+     *
+     * @return the clrName value
+     */
+    public String clrName() {
+        return this.clrName;
+    }
+
+    /**
+     * Set the name of the CLR.
+     *
+     * @param clrName the clrName value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withClrName(String clrName) {
+        this.clrName = clrName;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if this assembly is visible or not.
+     *
+     * @return the isVisible value
+     */
+    public Boolean isVisible() {
+        return this.isVisible;
+    }
+
+    /**
+     * Set the switch indicating if this assembly is visible or not.
+     *
+     * @param isVisible the isVisible value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withIsVisible(Boolean isVisible) {
+        this.isVisible = isVisible;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if this assembly is user defined or not.
+     *
+     * @return the isUserDefined value
+     */
+    public Boolean isUserDefined() {
+        return this.isUserDefined;
+    }
+
+    /**
+     * Set the switch indicating if this assembly is user defined or not.
+     *
+     * @param isUserDefined the isUserDefined value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withIsUserDefined(Boolean isUserDefined) {
+        this.isUserDefined = isUserDefined;
+        return this;
+    }
+
+    /**
+     * Get the list of files associated with the assembly.
+     *
+     * @return the files value
+     */
+    public List<USqlAssemblyFileInfo> files() {
+        return this.files;
+    }
+
+    /**
+     * Set the list of files associated with the assembly.
+     *
+     * @param files the files value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withFiles(List<USqlAssemblyFileInfo> files) {
+        this.files = files;
+        return this;
+    }
+
+    /**
+     * Get the list of dependencies associated with the assembly.
+     *
+     * @return the dependencies value
+     */
+    public List<USqlAssemblyDependencyInfo> dependencies() {
+        return this.dependencies;
+    }
+
+    /**
+     * Set the list of dependencies associated with the assembly.
+     *
+     * @param dependencies the dependencies value to set
+     * @return the USqlAssembly object itself.
+     */
+    public USqlAssembly withDependencies(List<USqlAssemblyDependencyInfo> dependencies) {
+        this.dependencies = dependencies;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyClr.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyClr.java
new file mode 100644
index 000000000000..b3b2a64b5be3
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyClr.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL assembly CLR item.
+ */
+public class USqlAssemblyClr extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the assembly.
+     */
+    @JsonProperty(value = "assemblyClrName")
+    private String name;
+
+    /**
+     * the name of the CLR.
+     */
+    @JsonProperty(value = "clrName")
+    private String clrName;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlAssemblyClr object itself.
+     */
+    public USqlAssemblyClr withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the assembly.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the assembly.
+     *
+     * @param name the name value to set
+     * @return the USqlAssemblyClr object itself.
+     */
+    public USqlAssemblyClr withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the name of the CLR.
+     *
+     * @return the clrName value
+     */
+    public String clrName() {
+        return this.clrName;
+    }
+
+    /**
+     * Set the name of the CLR.
+     *
+     * @param clrName the clrName value to set
+     * @return the USqlAssemblyClr object itself.
+     */
+    public USqlAssemblyClr withClrName(String clrName) {
+        this.clrName = clrName;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyDependencyInfo.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyDependencyInfo.java
new file mode 100644
index 000000000000..c4f200cc1099
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyDependencyInfo.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL dependency information item.
+ */
+public class USqlAssemblyDependencyInfo {
+    /**
+     * the EntityId of the dependency.
+     */
+    @JsonProperty(value = "entityId")
+    private EntityId entityId;
+
+    /**
+     * Get the EntityId of the dependency.
+     *
+     * @return the entityId value
+     */
+    public EntityId entityId() {
+        return this.entityId;
+    }
+
+    /**
+     * Set the EntityId of the dependency.
+     *
+     * @param entityId the entityId value to set
+     * @return the USqlAssemblyDependencyInfo object itself.
+     */
+    public USqlAssemblyDependencyInfo withEntityId(EntityId entityId) {
+        this.entityId = entityId;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyFileInfo.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyFileInfo.java
new file mode 100644
index 000000000000..32cf9f975329
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlAssemblyFileInfo.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL assembly file information item.
+ */
+public class USqlAssemblyFileInfo {
+    /**
+     * the assembly file type. Possible values include: 'Assembly', 'Resource'.
+     */
+    @JsonProperty(value = "type")
+    private FileType type;
+
+    /**
+     * the the original path to the assembly file.
+     */
+    @JsonProperty(value = "originalPath")
+    private String originalPath;
+
+    /**
+     * the the content path to the assembly file.
+     */
+    @JsonProperty(value = "contentPath")
+    private String contentPath;
+
+    /**
+     * Get the assembly file type. Possible values include: 'Assembly', 'Resource'.
+     *
+     * @return the type value
+     */
+    public FileType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the assembly file type. Possible values include: 'Assembly', 'Resource'.
+     *
+     * @param type the type value to set
+     * @return the USqlAssemblyFileInfo object itself.
+     */
+    public USqlAssemblyFileInfo withType(FileType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the the original path to the assembly file.
+     *
+     * @return the originalPath value
+     */
+    public String originalPath() {
+        return this.originalPath;
+    }
+
+    /**
+     * Set the the original path to the assembly file.
+     *
+     * @param originalPath the originalPath value to set
+     * @return the USqlAssemblyFileInfo object itself.
+     */
+    public USqlAssemblyFileInfo withOriginalPath(String originalPath) {
+        this.originalPath = originalPath;
+        return this;
+    }
+
+    /**
+     * Get the the content path to the assembly file.
+     *
+     * @return the contentPath value
+     */
+    public String contentPath() {
+        return this.contentPath;
+    }
+
+    /**
+     * Set the the content path to the assembly file.
+     *
+     * @param contentPath the contentPath value to set
+     * @return the USqlAssemblyFileInfo object itself.
+     */
+    public USqlAssemblyFileInfo withContentPath(String contentPath) {
+        this.contentPath = contentPath;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlCredential.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlCredential.java
new file mode 100644
index 000000000000..d71dea0b784e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlCredential.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL credential item.
+ */
+public class USqlCredential extends CatalogItem {
+    /**
+     * the name of the database the credential is in.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the secret associated with the credential.
+     */
+    @JsonProperty(value = "identity")
+    private String identity;
+
+    /**
+     * the name of the credential.
+     */
+    @JsonProperty(value = "credentialName")
+    private String name;
+
+    /**
+     * the user name associated with the credential.
+     */
+    @JsonProperty(value = "userName")
+    private String userName;
+
+    /**
+     * Get the name of the database the credential is in.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database the credential is in.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlCredential object itself.
+     */
+    public USqlCredential withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the secret associated with the credential.
+     *
+     * @return the identity value
+     */
+    public String identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the name of the secret associated with the credential.
+     *
+     * @param identity the identity value to set
+     * @return the USqlCredential object itself.
+     */
+    public USqlCredential withIdentity(String identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Get the name of the credential.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the credential.
+     *
+     * @param name the name value to set
+     * @return the USqlCredential object itself.
+     */
+    public USqlCredential withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the user name associated with the credential.
+     *
+     * @return the userName value
+     */
+    public String userName() {
+        return this.userName;
+    }
+
+    /**
+     * Set the user name associated with the credential.
+     *
+     * @param userName the userName value to set
+     * @return the USqlCredential object itself.
+     */
+    public USqlCredential withUserName(String userName) {
+        this.userName = userName;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDatabase.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDatabase.java
new file mode 100644
index 000000000000..f6e243760977
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDatabase.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL database item.
+ */
+public class USqlDatabase extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String name;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param name the name value to set
+     * @return the USqlDatabase object itself.
+     */
+    public USqlDatabase withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDirectedColumn.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDirectedColumn.java
new file mode 100644
index 000000000000..6b61c4750ae4
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDirectedColumn.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL directed column item.
+ */
+public class USqlDirectedColumn {
+    /**
+     * the name of the index in the table.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * the switch indicating if the index is descending or not.
+     */
+    @JsonProperty(value = "descending")
+    private Boolean descending;
+
+    /**
+     * Get the name of the index in the table.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the index in the table.
+     *
+     * @param name the name value to set
+     * @return the USqlDirectedColumn object itself.
+     */
+    public USqlDirectedColumn withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if the index is descending or not.
+     *
+     * @return the descending value
+     */
+    public Boolean descending() {
+        return this.descending;
+    }
+
+    /**
+     * Set the switch indicating if the index is descending or not.
+     *
+     * @param descending the descending value to set
+     * @return the USqlDirectedColumn object itself.
+     */
+    public USqlDirectedColumn withDescending(Boolean descending) {
+        this.descending = descending;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDistributionInfo.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDistributionInfo.java
new file mode 100644
index 000000000000..118100bd7d07
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlDistributionInfo.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL distribution information object.
+ */
+public class USqlDistributionInfo {
+    /**
+     * the type of this distribution.
+     */
+    @JsonProperty(value = "type")
+    private Integer type;
+
+    /**
+     * the list of directed columns in the distribution.
+     */
+    @JsonProperty(value = "keys")
+    private List<USqlDirectedColumn> keys;
+
+    /**
+     * the count of indices using this distribution.
+     */
+    @JsonProperty(value = "count")
+    private Integer count;
+
+    /**
+     * the dynamic count of indices using this distribution.
+     */
+    @JsonProperty(value = "dynamicCount")
+    private Integer dynamicCount;
+
+    /**
+     * Get the type of this distribution.
+     *
+     * @return the type value
+     */
+    public Integer type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type of this distribution.
+     *
+     * @param type the type value to set
+     * @return the USqlDistributionInfo object itself.
+     */
+    public USqlDistributionInfo withType(Integer type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the list of directed columns in the distribution.
+     *
+     * @return the keys value
+     */
+    public List<USqlDirectedColumn> keys() {
+        return this.keys;
+    }
+
+    /**
+     * Set the list of directed columns in the distribution.
+     *
+     * @param keys the keys value to set
+     * @return the USqlDistributionInfo object itself.
+     */
+    public USqlDistributionInfo withKeys(List<USqlDirectedColumn> keys) {
+        this.keys = keys;
+        return this;
+    }
+
+    /**
+     * Get the count of indices using this distribution.
+     *
+     * @return the count value
+     */
+    public Integer count() {
+        return this.count;
+    }
+
+    /**
+     * Set the count of indices using this distribution.
+     *
+     * @param count the count value to set
+     * @return the USqlDistributionInfo object itself.
+     */
+    public USqlDistributionInfo withCount(Integer count) {
+        this.count = count;
+        return this;
+    }
+
+    /**
+     * Get the dynamic count of indices using this distribution.
+     *
+     * @return the dynamicCount value
+     */
+    public Integer dynamicCount() {
+        return this.dynamicCount;
+    }
+
+    /**
+     * Set the dynamic count of indices using this distribution.
+     *
+     * @param dynamicCount the dynamicCount value to set
+     * @return the USqlDistributionInfo object itself.
+     */
+    public USqlDistributionInfo withDynamicCount(Integer dynamicCount) {
+        this.dynamicCount = dynamicCount;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlExternalDataSource.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlExternalDataSource.java
new file mode 100644
index 000000000000..9f53025fcd2e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlExternalDataSource.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL external datasource item.
+ */
+public class USqlExternalDataSource extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the external data source.
+     */
+    @JsonProperty(value = "externalDataSourceName")
+    private String name;
+
+    /**
+     * the name of the provider for the external data source.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * the name of the provider string for the external data source.
+     */
+    @JsonProperty(value = "providerString")
+    private String providerString;
+
+    /**
+     * the list of types to push down from the external data source.
+     */
+    @JsonProperty(value = "pushdownTypes")
+    private List<String> pushdownTypes;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlExternalDataSource object itself.
+     */
+    public USqlExternalDataSource withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the external data source.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the external data source.
+     *
+     * @param name the name value to set
+     * @return the USqlExternalDataSource object itself.
+     */
+    public USqlExternalDataSource withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the name of the provider for the external data source.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set the name of the provider for the external data source.
+     *
+     * @param provider the provider value to set
+     * @return the USqlExternalDataSource object itself.
+     */
+    public USqlExternalDataSource withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get the name of the provider string for the external data source.
+     *
+     * @return the providerString value
+     */
+    public String providerString() {
+        return this.providerString;
+    }
+
+    /**
+     * Set the name of the provider string for the external data source.
+     *
+     * @param providerString the providerString value to set
+     * @return the USqlExternalDataSource object itself.
+     */
+    public USqlExternalDataSource withProviderString(String providerString) {
+        this.providerString = providerString;
+        return this;
+    }
+
+    /**
+     * Get the list of types to push down from the external data source.
+     *
+     * @return the pushdownTypes value
+     */
+    public List<String> pushdownTypes() {
+        return this.pushdownTypes;
+    }
+
+    /**
+     * Set the list of types to push down from the external data source.
+     *
+     * @param pushdownTypes the pushdownTypes value to set
+     * @return the USqlExternalDataSource object itself.
+     */
+    public USqlExternalDataSource withPushdownTypes(List<String> pushdownTypes) {
+        this.pushdownTypes = pushdownTypes;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlIndex.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlIndex.java
new file mode 100644
index 000000000000..d45095048c97
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlIndex.java
@@ -0,0 +1,280 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table index item.
+ */
+public class USqlIndex {
+    /**
+     * the name of the index in the table.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * the list of directed columns in the index.
+     */
+    @JsonProperty(value = "indexKeys")
+    private List<USqlDirectedColumn> indexKeys;
+
+    /**
+     * the list of columns in the index.
+     */
+    @JsonProperty(value = "columns")
+    private List<String> columns;
+
+    /**
+     * the distributions info of the index.
+     */
+    @JsonProperty(value = "distributionInfo")
+    private USqlDistributionInfo distributionInfo;
+
+    /**
+     * partition function ID for the index.
+     */
+    @JsonProperty(value = "partitionFunction")
+    private UUID partitionFunction;
+
+    /**
+     * the list of partion keys in the index.
+     */
+    @JsonProperty(value = "partitionKeyList")
+    private List<String> partitionKeyList;
+
+    /**
+     * the list of full paths to the streams that contain this index in the
+     * DataLake account.
+     */
+    @JsonProperty(value = "streamNames")
+    private List<String> streamNames;
+
+    /**
+     * the switch indicating if this index is a columnstore index.
+     */
+    @JsonProperty(value = "isColumnstore")
+    private Boolean isColumnstore;
+
+    /**
+     * the ID of this index within the table.
+     */
+    @JsonProperty(value = "indexId")
+    private Integer indexId;
+
+    /**
+     * the switch indicating if this index is a unique index.
+     */
+    @JsonProperty(value = "isUnique")
+    private Boolean isUnique;
+
+    /**
+     * Get the name of the index in the table.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the index in the table.
+     *
+     * @param name the name value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the list of directed columns in the index.
+     *
+     * @return the indexKeys value
+     */
+    public List<USqlDirectedColumn> indexKeys() {
+        return this.indexKeys;
+    }
+
+    /**
+     * Set the list of directed columns in the index.
+     *
+     * @param indexKeys the indexKeys value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withIndexKeys(List<USqlDirectedColumn> indexKeys) {
+        this.indexKeys = indexKeys;
+        return this;
+    }
+
+    /**
+     * Get the list of columns in the index.
+     *
+     * @return the columns value
+     */
+    public List<String> columns() {
+        return this.columns;
+    }
+
+    /**
+     * Set the list of columns in the index.
+     *
+     * @param columns the columns value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withColumns(List<String> columns) {
+        this.columns = columns;
+        return this;
+    }
+
+    /**
+     * Get the distributions info of the index.
+     *
+     * @return the distributionInfo value
+     */
+    public USqlDistributionInfo distributionInfo() {
+        return this.distributionInfo;
+    }
+
+    /**
+     * Set the distributions info of the index.
+     *
+     * @param distributionInfo the distributionInfo value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withDistributionInfo(USqlDistributionInfo distributionInfo) {
+        this.distributionInfo = distributionInfo;
+        return this;
+    }
+
+    /**
+     * Get partition function ID for the index.
+     *
+     * @return the partitionFunction value
+     */
+    public UUID partitionFunction() {
+        return this.partitionFunction;
+    }
+
+    /**
+     * Set partition function ID for the index.
+     *
+     * @param partitionFunction the partitionFunction value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withPartitionFunction(UUID partitionFunction) {
+        this.partitionFunction = partitionFunction;
+        return this;
+    }
+
+    /**
+     * Get the list of partion keys in the index.
+     *
+     * @return the partitionKeyList value
+     */
+    public List<String> partitionKeyList() {
+        return this.partitionKeyList;
+    }
+
+    /**
+     * Set the list of partion keys in the index.
+     *
+     * @param partitionKeyList the partitionKeyList value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withPartitionKeyList(List<String> partitionKeyList) {
+        this.partitionKeyList = partitionKeyList;
+        return this;
+    }
+
+    /**
+     * Get the list of full paths to the streams that contain this index in the DataLake account.
+     *
+     * @return the streamNames value
+     */
+    public List<String> streamNames() {
+        return this.streamNames;
+    }
+
+    /**
+     * Set the list of full paths to the streams that contain this index in the DataLake account.
+     *
+     * @param streamNames the streamNames value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withStreamNames(List<String> streamNames) {
+        this.streamNames = streamNames;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if this index is a columnstore index.
+     *
+     * @return the isColumnstore value
+     */
+    public Boolean isColumnstore() {
+        return this.isColumnstore;
+    }
+
+    /**
+     * Set the switch indicating if this index is a columnstore index.
+     *
+     * @param isColumnstore the isColumnstore value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withIsColumnstore(Boolean isColumnstore) {
+        this.isColumnstore = isColumnstore;
+        return this;
+    }
+
+    /**
+     * Get the ID of this index within the table.
+     *
+     * @return the indexId value
+     */
+    public Integer indexId() {
+        return this.indexId;
+    }
+
+    /**
+     * Set the ID of this index within the table.
+     *
+     * @param indexId the indexId value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withIndexId(Integer indexId) {
+        this.indexId = indexId;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if this index is a unique index.
+     *
+     * @return the isUnique value
+     */
+    public Boolean isUnique() {
+        return this.isUnique;
+    }
+
+    /**
+     * Set the switch indicating if this index is a unique index.
+     *
+     * @param isUnique the isUnique value to set
+     * @return the USqlIndex object itself.
+     */
+    public USqlIndex withIsUnique(Boolean isUnique) {
+        this.isUnique = isUnique;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlJobProperties.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlJobProperties.java
new file mode 100644
index 000000000000..18abcd77d557
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlJobProperties.java
@@ -0,0 +1,255 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+/**
+ * The USqlJobProperties model.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeName("USql")
+public class USqlJobProperties extends JobProperties {
+    /**
+     * Gets or sets the list of resources that are required by the job.
+     */
+    @JsonProperty(value = "resources")
+    private List<JobResource> resources;
+
+    /**
+     * Gets or sets the job specific statistics.
+     */
+    @JsonProperty(value = "statistics")
+    private JobStatistics statistics;
+
+    /**
+     * Gets or sets the job specific debug data locations.
+     */
+    @JsonProperty(value = "debugData")
+    private JobDataPath debugData;
+
+    /**
+     * Gets the U-SQL algebra file path after the job has completed.
+     */
+    @JsonProperty(value = "algebraFilePath", access = JsonProperty.Access.WRITE_ONLY)
+    private String algebraFilePath;
+
+    /**
+     * Gets the total time this job spent compiling. This value should not be
+     * set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalCompilationTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalCompilationTime;
+
+    /**
+     * Gets the total time this job spent paused. This value should not be set
+     * by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalPauseTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalPauseTime;
+
+    /**
+     * Gets the total time this job spent queued. This value should not be set
+     * by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalQueuedTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalQueuedTime;
+
+    /**
+     * Gets the total time this job spent executing. This value should not be
+     * set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "totalRunningTime", access = JsonProperty.Access.WRITE_ONLY)
+    private String totalRunningTime;
+
+    /**
+     * Gets the ID used to identify the job manager coordinating job execution.
+     * This value should not be set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "rootProcessNodeId", access = JsonProperty.Access.WRITE_ONLY)
+    private String rootProcessNodeId;
+
+    /**
+     * Gets the ID used to identify the yarn application executing the job.
+     * This value should not be set by the user and will be ignored if it is.
+     */
+    @JsonProperty(value = "yarnApplicationId", access = JsonProperty.Access.WRITE_ONLY)
+    private String yarnApplicationId;
+
+    /**
+     * Gets the timestamp (in ticks) for the yarn application executing the
+     * job. This value should not be set by the user and will be ignored if it
+     * is.
+     */
+    @JsonProperty(value = "yarnApplicationTimeStamp", access = JsonProperty.Access.WRITE_ONLY)
+    private Long yarnApplicationTimeStamp;
+
+    /**
+     * Gets or sets the compile mode for the job. Possible values include:
+     * 'Semantic', 'Full', 'SingleBox'.
+     */
+    @JsonProperty(value = "compileMode")
+    private CompileMode compileMode;
+
+    /**
+     * Get gets or sets the list of resources that are required by the job.
+     *
+     * @return the resources value
+     */
+    public List<JobResource> resources() {
+        return this.resources;
+    }
+
+    /**
+     * Set gets or sets the list of resources that are required by the job.
+     *
+     * @param resources the resources value to set
+     * @return the USqlJobProperties object itself.
+     */
+    public USqlJobProperties withResources(List<JobResource> resources) {
+        this.resources = resources;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the job specific statistics.
+     *
+     * @return the statistics value
+     */
+    public JobStatistics statistics() {
+        return this.statistics;
+    }
+
+    /**
+     * Set gets or sets the job specific statistics.
+     *
+     * @param statistics the statistics value to set
+     * @return the USqlJobProperties object itself.
+     */
+    public USqlJobProperties withStatistics(JobStatistics statistics) {
+        this.statistics = statistics;
+        return this;
+    }
+
+    /**
+     * Get gets or sets the job specific debug data locations.
+     *
+     * @return the debugData value
+     */
+    public JobDataPath debugData() {
+        return this.debugData;
+    }
+
+    /**
+     * Set gets or sets the job specific debug data locations.
+     *
+     * @param debugData the debugData value to set
+     * @return the USqlJobProperties object itself.
+     */
+    public USqlJobProperties withDebugData(JobDataPath debugData) {
+        this.debugData = debugData;
+        return this;
+    }
+
+    /**
+     * Get gets the U-SQL algebra file path after the job has completed.
+     *
+     * @return the algebraFilePath value
+     */
+    public String algebraFilePath() {
+        return this.algebraFilePath;
+    }
+
+    /**
+     * Get gets the total time this job spent compiling. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalCompilationTime value
+     */
+    public String totalCompilationTime() {
+        return this.totalCompilationTime;
+    }
+
+    /**
+     * Get gets the total time this job spent paused. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalPauseTime value
+     */
+    public String totalPauseTime() {
+        return this.totalPauseTime;
+    }
+
+    /**
+     * Get gets the total time this job spent queued. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalQueuedTime value
+     */
+    public String totalQueuedTime() {
+        return this.totalQueuedTime;
+    }
+
+    /**
+     * Get gets the total time this job spent executing. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the totalRunningTime value
+     */
+    public String totalRunningTime() {
+        return this.totalRunningTime;
+    }
+
+    /**
+     * Get gets the ID used to identify the job manager coordinating job execution. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the rootProcessNodeId value
+     */
+    public String rootProcessNodeId() {
+        return this.rootProcessNodeId;
+    }
+
+    /**
+     * Get gets the ID used to identify the yarn application executing the job. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the yarnApplicationId value
+     */
+    public String yarnApplicationId() {
+        return this.yarnApplicationId;
+    }
+
+    /**
+     * Get gets the timestamp (in ticks) for the yarn application executing the job. This value should not be set by the user and will be ignored if it is.
+     *
+     * @return the yarnApplicationTimeStamp value
+     */
+    public Long yarnApplicationTimeStamp() {
+        return this.yarnApplicationTimeStamp;
+    }
+
+    /**
+     * Get gets or sets the compile mode for the job. Possible values include: 'Semantic', 'Full', 'SingleBox'.
+     *
+     * @return the compileMode value
+     */
+    public CompileMode compileMode() {
+        return this.compileMode;
+    }
+
+    /**
+     * Set gets or sets the compile mode for the job. Possible values include: 'Semantic', 'Full', 'SingleBox'.
+     *
+     * @param compileMode the compileMode value to set
+     * @return the USqlJobProperties object itself.
+     */
+    public USqlJobProperties withCompileMode(CompileMode compileMode) {
+        this.compileMode = compileMode;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlPackage.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlPackage.java
new file mode 100644
index 000000000000..98ab7040acab
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlPackage.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL package item.
+ */
+public class USqlPackage extends CatalogItem {
+    /**
+     * the name of the database containing the package.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this package and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the package.
+     */
+    @JsonProperty(value = "packageName")
+    private String name;
+
+    /**
+     * the definition of the package.
+     */
+    @JsonProperty(value = "definition")
+    private String definition;
+
+    /**
+     * Get the name of the database containing the package.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database containing the package.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlPackage object itself.
+     */
+    public USqlPackage withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this package and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this package and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlPackage object itself.
+     */
+    public USqlPackage withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the package.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the package.
+     *
+     * @param name the name value to set
+     * @return the USqlPackage object itself.
+     */
+    public USqlPackage withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the definition of the package.
+     *
+     * @return the definition value
+     */
+    public String definition() {
+        return this.definition;
+    }
+
+    /**
+     * Set the definition of the package.
+     *
+     * @param definition the definition value to set
+     * @return the USqlPackage object itself.
+     */
+    public USqlPackage withDefinition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlProcedure.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlProcedure.java
new file mode 100644
index 000000000000..19c05eba2dac
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlProcedure.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL procedure item.
+ */
+public class USqlProcedure extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this procedure and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the procedure.
+     */
+    @JsonProperty(value = "procName")
+    private String name;
+
+    /**
+     * the defined query of the procedure.
+     */
+    @JsonProperty(value = "definition")
+    private String definition;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlProcedure object itself.
+     */
+    public USqlProcedure withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this procedure and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this procedure and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlProcedure object itself.
+     */
+    public USqlProcedure withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the procedure.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the procedure.
+     *
+     * @param name the name value to set
+     * @return the USqlProcedure object itself.
+     */
+    public USqlProcedure withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the defined query of the procedure.
+     *
+     * @return the definition value
+     */
+    public String definition() {
+        return this.definition;
+    }
+
+    /**
+     * Set the defined query of the procedure.
+     *
+     * @param definition the definition value to set
+     * @return the USqlProcedure object itself.
+     */
+    public USqlProcedure withDefinition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSchema.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSchema.java
new file mode 100644
index 000000000000..947d20fa8b33
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSchema.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL schema item.
+ */
+public class USqlSchema extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema.
+     */
+    @JsonProperty(value = "schemaName")
+    private String name;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlSchema object itself.
+     */
+    public USqlSchema withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the schema.
+     *
+     * @param name the name value to set
+     * @return the USqlSchema object itself.
+     */
+    public USqlSchema withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSecret.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSecret.java
new file mode 100644
index 000000000000..d550c37a662e
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlSecret.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL secret item.
+ */
+public class USqlSecret extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the secret.
+     */
+    @JsonProperty(value = "secretName")
+    private String name;
+
+    /**
+     * the creation time of the credential object. This is the only information
+     * returned about a secret from a GET.
+     */
+    @JsonProperty(value = "creationTime")
+    private DateTime creationTime;
+
+    /**
+     * the URI identifier for the secret in the format
+     * &lt;hostname&gt;:&lt;port&gt;.
+     */
+    @JsonProperty(value = "uri")
+    private String uri;
+
+    /**
+     * the password for the secret to pass in.
+     */
+    @JsonProperty(value = "password")
+    private String password;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlSecret object itself.
+     */
+    public USqlSecret withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the secret.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the secret.
+     *
+     * @param name the name value to set
+     * @return the USqlSecret object itself.
+     */
+    public USqlSecret withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the creation time of the credential object. This is the only information returned about a secret from a GET.
+     *
+     * @return the creationTime value
+     */
+    public DateTime creationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * Set the creation time of the credential object. This is the only information returned about a secret from a GET.
+     *
+     * @param creationTime the creationTime value to set
+     * @return the USqlSecret object itself.
+     */
+    public USqlSecret withCreationTime(DateTime creationTime) {
+        this.creationTime = creationTime;
+        return this;
+    }
+
+    /**
+     * Get the URI identifier for the secret in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Set the URI identifier for the secret in the format &lt;hostname&gt;:&lt;port&gt;.
+     *
+     * @param uri the uri value to set
+     * @return the USqlSecret object itself.
+     */
+    public USqlSecret withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    /**
+     * Get the password for the secret to pass in.
+     *
+     * @return the password value
+     */
+    public String password() {
+        return this.password;
+    }
+
+    /**
+     * Set the password for the secret to pass in.
+     *
+     * @param password the password value to set
+     * @return the USqlSecret object itself.
+     */
+    public USqlSecret withPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTable.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTable.java
new file mode 100644
index 000000000000..0474a4dadd68
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTable.java
@@ -0,0 +1,226 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table item.
+ */
+public class USqlTable extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this table and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the table.
+     */
+    @JsonProperty(value = "tableName")
+    private String name;
+
+    /**
+     * the list of columns in this table.
+     */
+    @JsonProperty(value = "columnList")
+    private List<USqlTableColumn> columnList;
+
+    /**
+     * the list of indices in this table.
+     */
+    @JsonProperty(value = "indexList")
+    private List<USqlIndex> indexList;
+
+    /**
+     * the list of partition keys in the table.
+     */
+    @JsonProperty(value = "partitionKeyList")
+    private List<String> partitionKeyList;
+
+    /**
+     * the external table associated with the table.
+     */
+    @JsonProperty(value = "externalTable")
+    private ExternalTable externalTable;
+
+    /**
+     * the distributions info of the table.
+     */
+    @JsonProperty(value = "distributionInfo")
+    private USqlDistributionInfo distributionInfo;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this table and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this table and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the table.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the table.
+     *
+     * @param name the name value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the list of columns in this table.
+     *
+     * @return the columnList value
+     */
+    public List<USqlTableColumn> columnList() {
+        return this.columnList;
+    }
+
+    /**
+     * Set the list of columns in this table.
+     *
+     * @param columnList the columnList value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withColumnList(List<USqlTableColumn> columnList) {
+        this.columnList = columnList;
+        return this;
+    }
+
+    /**
+     * Get the list of indices in this table.
+     *
+     * @return the indexList value
+     */
+    public List<USqlIndex> indexList() {
+        return this.indexList;
+    }
+
+    /**
+     * Set the list of indices in this table.
+     *
+     * @param indexList the indexList value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withIndexList(List<USqlIndex> indexList) {
+        this.indexList = indexList;
+        return this;
+    }
+
+    /**
+     * Get the list of partition keys in the table.
+     *
+     * @return the partitionKeyList value
+     */
+    public List<String> partitionKeyList() {
+        return this.partitionKeyList;
+    }
+
+    /**
+     * Set the list of partition keys in the table.
+     *
+     * @param partitionKeyList the partitionKeyList value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withPartitionKeyList(List<String> partitionKeyList) {
+        this.partitionKeyList = partitionKeyList;
+        return this;
+    }
+
+    /**
+     * Get the external table associated with the table.
+     *
+     * @return the externalTable value
+     */
+    public ExternalTable externalTable() {
+        return this.externalTable;
+    }
+
+    /**
+     * Set the external table associated with the table.
+     *
+     * @param externalTable the externalTable value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withExternalTable(ExternalTable externalTable) {
+        this.externalTable = externalTable;
+        return this;
+    }
+
+    /**
+     * Get the distributions info of the table.
+     *
+     * @return the distributionInfo value
+     */
+    public USqlDistributionInfo distributionInfo() {
+        return this.distributionInfo;
+    }
+
+    /**
+     * Set the distributions info of the table.
+     *
+     * @param distributionInfo the distributionInfo value to set
+     * @return the USqlTable object itself.
+     */
+    public USqlTable withDistributionInfo(USqlDistributionInfo distributionInfo) {
+        this.distributionInfo = distributionInfo;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableColumn.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableColumn.java
new file mode 100644
index 000000000000..e388b6b4ca4f
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableColumn.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table column item.
+ */
+public class USqlTableColumn {
+    /**
+     * the name of the column in the table.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * the object type of the specified column (such as System.String).
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Get the name of the column in the table.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the column in the table.
+     *
+     * @param name the name value to set
+     * @return the USqlTableColumn object itself.
+     */
+    public USqlTableColumn withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the object type of the specified column (such as System.String).
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set the object type of the specified column (such as System.String).
+     *
+     * @param type the type value to set
+     * @return the USqlTableColumn object itself.
+     */
+    public USqlTableColumn withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableFragment.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableFragment.java
new file mode 100644
index 000000000000..a74dd25b708d
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableFragment.java
@@ -0,0 +1,176 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.UUID;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table fragment item.
+ */
+public class USqlTableFragment {
+    /**
+     * the parent object Id of the table fragment. The parent could be a table
+     * or table partition.
+     */
+    @JsonProperty(value = "parentId")
+    private UUID parentId;
+
+    /**
+     * the version of the catalog item.
+     */
+    @JsonProperty(value = "fragmentId")
+    private UUID fragmentId;
+
+    /**
+     * the ordinal of the index which contains the table fragment.
+     */
+    @JsonProperty(value = "indexId")
+    private Integer indexId;
+
+    /**
+     * the data size of the table fragment in bytes.
+     */
+    @JsonProperty(value = "size")
+    private Long size;
+
+    /**
+     * the number of rows in the table fragment.
+     */
+    @JsonProperty(value = "rowCount")
+    private Long rowCount;
+
+    /**
+     * the creation time of the table fragment.
+     */
+    @JsonProperty(value = "createDate")
+    private DateTime createDate;
+
+    /**
+     * Get the parent object Id of the table fragment. The parent could be a table or table partition.
+     *
+     * @return the parentId value
+     */
+    public UUID parentId() {
+        return this.parentId;
+    }
+
+    /**
+     * Set the parent object Id of the table fragment. The parent could be a table or table partition.
+     *
+     * @param parentId the parentId value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withParentId(UUID parentId) {
+        this.parentId = parentId;
+        return this;
+    }
+
+    /**
+     * Get the version of the catalog item.
+     *
+     * @return the fragmentId value
+     */
+    public UUID fragmentId() {
+        return this.fragmentId;
+    }
+
+    /**
+     * Set the version of the catalog item.
+     *
+     * @param fragmentId the fragmentId value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withFragmentId(UUID fragmentId) {
+        this.fragmentId = fragmentId;
+        return this;
+    }
+
+    /**
+     * Get the ordinal of the index which contains the table fragment.
+     *
+     * @return the indexId value
+     */
+    public Integer indexId() {
+        return this.indexId;
+    }
+
+    /**
+     * Set the ordinal of the index which contains the table fragment.
+     *
+     * @param indexId the indexId value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withIndexId(Integer indexId) {
+        this.indexId = indexId;
+        return this;
+    }
+
+    /**
+     * Get the data size of the table fragment in bytes.
+     *
+     * @return the size value
+     */
+    public Long size() {
+        return this.size;
+    }
+
+    /**
+     * Set the data size of the table fragment in bytes.
+     *
+     * @param size the size value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withSize(Long size) {
+        this.size = size;
+        return this;
+    }
+
+    /**
+     * Get the number of rows in the table fragment.
+     *
+     * @return the rowCount value
+     */
+    public Long rowCount() {
+        return this.rowCount;
+    }
+
+    /**
+     * Set the number of rows in the table fragment.
+     *
+     * @param rowCount the rowCount value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withRowCount(Long rowCount) {
+        this.rowCount = rowCount;
+        return this;
+    }
+
+    /**
+     * Get the creation time of the table fragment.
+     *
+     * @return the createDate value
+     */
+    public DateTime createDate() {
+        return this.createDate;
+    }
+
+    /**
+     * Set the creation time of the table fragment.
+     *
+     * @param createDate the createDate value to set
+     * @return the USqlTableFragment object itself.
+     */
+    public USqlTableFragment withCreateDate(DateTime createDate) {
+        this.createDate = createDate;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePartition.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePartition.java
new file mode 100644
index 000000000000..15e1ad632ee0
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePartition.java
@@ -0,0 +1,202 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table partition item.
+ */
+public class USqlTablePartition extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this table partition and
+     * database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the table partition.
+     */
+    @JsonProperty(value = "partitionName")
+    private String name;
+
+    /**
+     * the Ddl object of the partition's parent.
+     */
+    @JsonProperty(value = "parentName")
+    private DdlName parentName;
+
+    /**
+     * the index ID for this partition.
+     */
+    @JsonProperty(value = "indexId")
+    private Integer indexId;
+
+    /**
+     * the list of labels associated with this partition.
+     */
+    @JsonProperty(value = "label")
+    private List<String> label;
+
+    /**
+     * the creation time of the partition.
+     */
+    @JsonProperty(value = "createDate")
+    private DateTime createDate;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this table partition and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this table partition and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the table partition.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the table partition.
+     *
+     * @param name the name value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the Ddl object of the partition's parent.
+     *
+     * @return the parentName value
+     */
+    public DdlName parentName() {
+        return this.parentName;
+    }
+
+    /**
+     * Set the Ddl object of the partition's parent.
+     *
+     * @param parentName the parentName value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withParentName(DdlName parentName) {
+        this.parentName = parentName;
+        return this;
+    }
+
+    /**
+     * Get the index ID for this partition.
+     *
+     * @return the indexId value
+     */
+    public Integer indexId() {
+        return this.indexId;
+    }
+
+    /**
+     * Set the index ID for this partition.
+     *
+     * @param indexId the indexId value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withIndexId(Integer indexId) {
+        this.indexId = indexId;
+        return this;
+    }
+
+    /**
+     * Get the list of labels associated with this partition.
+     *
+     * @return the label value
+     */
+    public List<String> label() {
+        return this.label;
+    }
+
+    /**
+     * Set the list of labels associated with this partition.
+     *
+     * @param label the label value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withLabel(List<String> label) {
+        this.label = label;
+        return this;
+    }
+
+    /**
+     * Get the creation time of the partition.
+     *
+     * @return the createDate value
+     */
+    public DateTime createDate() {
+        return this.createDate;
+    }
+
+    /**
+     * Set the creation time of the partition.
+     *
+     * @param createDate the createDate value to set
+     * @return the USqlTablePartition object itself.
+     */
+    public USqlTablePartition withCreateDate(DateTime createDate) {
+        this.createDate = createDate;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePreview.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePreview.java
new file mode 100644
index 000000000000..040d8e4bea44
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTablePreview.java
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog table or partition preview rows item.
+ */
+public class USqlTablePreview {
+    /**
+     * the total number of rows in the table or partition.
+     */
+    @JsonProperty(value = "totalRowCount")
+    private Long totalRowCount;
+
+    /**
+     * the total number of columns in the table or partition.
+     */
+    @JsonProperty(value = "totalColumnCount")
+    private Long totalColumnCount;
+
+    /**
+     * the rows of the table or partition preview, where each row is an array
+     * of string representations the row's values. Note: Byte arrays will
+     * appear as base-64 encoded values, SqlMap and SqlArray objects will
+     * appear as escaped JSON objects, and DateTime objects will appear as ISO
+     * formatted UTC date-times.
+     */
+    @JsonProperty(value = "rows")
+    private List<List<String>> rows;
+
+    /**
+     * true if the amount of data in the response is less than expected due to
+     * the preview operation's size limitations. This can occur if the
+     * requested rows or row counts are too large.
+     */
+    @JsonProperty(value = "truncated")
+    private Boolean truncated;
+
+    /**
+     * the schema of the table or partition.
+     */
+    @JsonProperty(value = "schema")
+    private List<USqlTableColumn> schema;
+
+    /**
+     * Get the total number of rows in the table or partition.
+     *
+     * @return the totalRowCount value
+     */
+    public Long totalRowCount() {
+        return this.totalRowCount;
+    }
+
+    /**
+     * Set the total number of rows in the table or partition.
+     *
+     * @param totalRowCount the totalRowCount value to set
+     * @return the USqlTablePreview object itself.
+     */
+    public USqlTablePreview withTotalRowCount(Long totalRowCount) {
+        this.totalRowCount = totalRowCount;
+        return this;
+    }
+
+    /**
+     * Get the total number of columns in the table or partition.
+     *
+     * @return the totalColumnCount value
+     */
+    public Long totalColumnCount() {
+        return this.totalColumnCount;
+    }
+
+    /**
+     * Set the total number of columns in the table or partition.
+     *
+     * @param totalColumnCount the totalColumnCount value to set
+     * @return the USqlTablePreview object itself.
+     */
+    public USqlTablePreview withTotalColumnCount(Long totalColumnCount) {
+        this.totalColumnCount = totalColumnCount;
+        return this;
+    }
+
+    /**
+     * Get the rows of the table or partition preview, where each row is an array of string representations the row's values. Note: Byte arrays will appear as base-64 encoded values, SqlMap and SqlArray objects will appear as escaped JSON objects, and DateTime objects will appear as ISO formatted UTC date-times.
+     *
+     * @return the rows value
+     */
+    public List<List<String>> rows() {
+        return this.rows;
+    }
+
+    /**
+     * Set the rows of the table or partition preview, where each row is an array of string representations the row's values. Note: Byte arrays will appear as base-64 encoded values, SqlMap and SqlArray objects will appear as escaped JSON objects, and DateTime objects will appear as ISO formatted UTC date-times.
+     *
+     * @param rows the rows value to set
+     * @return the USqlTablePreview object itself.
+     */
+    public USqlTablePreview withRows(List<List<String>> rows) {
+        this.rows = rows;
+        return this;
+    }
+
+    /**
+     * Get true if the amount of data in the response is less than expected due to the preview operation's size limitations. This can occur if the requested rows or row counts are too large.
+     *
+     * @return the truncated value
+     */
+    public Boolean truncated() {
+        return this.truncated;
+    }
+
+    /**
+     * Set true if the amount of data in the response is less than expected due to the preview operation's size limitations. This can occur if the requested rows or row counts are too large.
+     *
+     * @param truncated the truncated value to set
+     * @return the USqlTablePreview object itself.
+     */
+    public USqlTablePreview withTruncated(Boolean truncated) {
+        this.truncated = truncated;
+        return this;
+    }
+
+    /**
+     * Get the schema of the table or partition.
+     *
+     * @return the schema value
+     */
+    public List<USqlTableColumn> schema() {
+        return this.schema;
+    }
+
+    /**
+     * Set the schema of the table or partition.
+     *
+     * @param schema the schema value to set
+     * @return the USqlTablePreview object itself.
+     */
+    public USqlTablePreview withSchema(List<USqlTableColumn> schema) {
+        this.schema = schema;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableStatistics.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableStatistics.java
new file mode 100644
index 000000000000..b811f70861ed
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableStatistics.java
@@ -0,0 +1,357 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import org.joda.time.DateTime;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table statistics item.
+ */
+public class USqlTableStatistics extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this table and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the table.
+     */
+    @JsonProperty(value = "tableName")
+    private String tableName;
+
+    /**
+     * the name of the table statistics.
+     */
+    @JsonProperty(value = "statisticsName")
+    private String name;
+
+    /**
+     * the name of the user statistics.
+     */
+    @JsonProperty(value = "userStatName")
+    private String userStatName;
+
+    /**
+     * the path to the statistics data.
+     */
+    @JsonProperty(value = "statDataPath")
+    private String statDataPath;
+
+    /**
+     * the creation time of the statistics.
+     */
+    @JsonProperty(value = "createTime")
+    private DateTime createTime;
+
+    /**
+     * the last time the statistics were updated.
+     */
+    @JsonProperty(value = "updateTime")
+    private DateTime updateTime;
+
+    /**
+     * the switch indicating if these statistics are user created.
+     */
+    @JsonProperty(value = "isUserCreated")
+    private Boolean isUserCreated;
+
+    /**
+     * the switch indicating if these statistics are automatically created.
+     */
+    @JsonProperty(value = "isAutoCreated")
+    private Boolean isAutoCreated;
+
+    /**
+     * the switch indicating if these statistics have a filter.
+     */
+    @JsonProperty(value = "hasFilter")
+    private Boolean hasFilter;
+
+    /**
+     * the filter definition for the statistics.
+     */
+    @JsonProperty(value = "filterDefinition")
+    private String filterDefinition;
+
+    /**
+     * the list of column names associated with these statistics.
+     */
+    @JsonProperty(value = "colNames")
+    private List<String> colNames;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this table and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this table and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the table.
+     *
+     * @return the tableName value
+     */
+    public String tableName() {
+        return this.tableName;
+    }
+
+    /**
+     * Set the name of the table.
+     *
+     * @param tableName the tableName value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withTableName(String tableName) {
+        this.tableName = tableName;
+        return this;
+    }
+
+    /**
+     * Get the name of the table statistics.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the table statistics.
+     *
+     * @param name the name value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the name of the user statistics.
+     *
+     * @return the userStatName value
+     */
+    public String userStatName() {
+        return this.userStatName;
+    }
+
+    /**
+     * Set the name of the user statistics.
+     *
+     * @param userStatName the userStatName value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withUserStatName(String userStatName) {
+        this.userStatName = userStatName;
+        return this;
+    }
+
+    /**
+     * Get the path to the statistics data.
+     *
+     * @return the statDataPath value
+     */
+    public String statDataPath() {
+        return this.statDataPath;
+    }
+
+    /**
+     * Set the path to the statistics data.
+     *
+     * @param statDataPath the statDataPath value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withStatDataPath(String statDataPath) {
+        this.statDataPath = statDataPath;
+        return this;
+    }
+
+    /**
+     * Get the creation time of the statistics.
+     *
+     * @return the createTime value
+     */
+    public DateTime createTime() {
+        return this.createTime;
+    }
+
+    /**
+     * Set the creation time of the statistics.
+     *
+     * @param createTime the createTime value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withCreateTime(DateTime createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    /**
+     * Get the last time the statistics were updated.
+     *
+     * @return the updateTime value
+     */
+    public DateTime updateTime() {
+        return this.updateTime;
+    }
+
+    /**
+     * Set the last time the statistics were updated.
+     *
+     * @param updateTime the updateTime value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withUpdateTime(DateTime updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if these statistics are user created.
+     *
+     * @return the isUserCreated value
+     */
+    public Boolean isUserCreated() {
+        return this.isUserCreated;
+    }
+
+    /**
+     * Set the switch indicating if these statistics are user created.
+     *
+     * @param isUserCreated the isUserCreated value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withIsUserCreated(Boolean isUserCreated) {
+        this.isUserCreated = isUserCreated;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if these statistics are automatically created.
+     *
+     * @return the isAutoCreated value
+     */
+    public Boolean isAutoCreated() {
+        return this.isAutoCreated;
+    }
+
+    /**
+     * Set the switch indicating if these statistics are automatically created.
+     *
+     * @param isAutoCreated the isAutoCreated value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withIsAutoCreated(Boolean isAutoCreated) {
+        this.isAutoCreated = isAutoCreated;
+        return this;
+    }
+
+    /**
+     * Get the switch indicating if these statistics have a filter.
+     *
+     * @return the hasFilter value
+     */
+    public Boolean hasFilter() {
+        return this.hasFilter;
+    }
+
+    /**
+     * Set the switch indicating if these statistics have a filter.
+     *
+     * @param hasFilter the hasFilter value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withHasFilter(Boolean hasFilter) {
+        this.hasFilter = hasFilter;
+        return this;
+    }
+
+    /**
+     * Get the filter definition for the statistics.
+     *
+     * @return the filterDefinition value
+     */
+    public String filterDefinition() {
+        return this.filterDefinition;
+    }
+
+    /**
+     * Set the filter definition for the statistics.
+     *
+     * @param filterDefinition the filterDefinition value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withFilterDefinition(String filterDefinition) {
+        this.filterDefinition = filterDefinition;
+        return this;
+    }
+
+    /**
+     * Get the list of column names associated with these statistics.
+     *
+     * @return the colNames value
+     */
+    public List<String> colNames() {
+        return this.colNames;
+    }
+
+    /**
+     * Set the list of column names associated with these statistics.
+     *
+     * @param colNames the colNames value to set
+     * @return the USqlTableStatistics object itself.
+     */
+    public USqlTableStatistics withColNames(List<String> colNames) {
+        this.colNames = colNames;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableType.java
new file mode 100644
index 000000000000..91615656f0e0
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableType.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table type item.
+ */
+public class USqlTableType extends USqlType {
+    /**
+     * the type field information associated with this table type.
+     */
+    @JsonProperty(value = "columns", access = JsonProperty.Access.WRITE_ONLY)
+    private List<TypeFieldInfo> columns;
+
+    /**
+     * Get the type field information associated with this table type.
+     *
+     * @return the columns value
+     */
+    public List<TypeFieldInfo> columns() {
+        return this.columns;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableValuedFunction.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableValuedFunction.java
new file mode 100644
index 000000000000..b210fa56df25
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlTableValuedFunction.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL table valued function item.
+ */
+public class USqlTableValuedFunction extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the table valued function.
+     */
+    @JsonProperty(value = "tvfName")
+    private String name;
+
+    /**
+     * the definition of the table valued function.
+     */
+    @JsonProperty(value = "definition")
+    private String definition;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlTableValuedFunction object itself.
+     */
+    public USqlTableValuedFunction withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlTableValuedFunction object itself.
+     */
+    public USqlTableValuedFunction withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the table valued function.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the table valued function.
+     *
+     * @param name the name value to set
+     * @return the USqlTableValuedFunction object itself.
+     */
+    public USqlTableValuedFunction withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the definition of the table valued function.
+     *
+     * @return the definition value
+     */
+    public String definition() {
+        return this.definition;
+    }
+
+    /**
+     * Set the definition of the table valued function.
+     *
+     * @param definition the definition value to set
+     * @return the USqlTableValuedFunction object itself.
+     */
+    public USqlTableValuedFunction withDefinition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlType.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlType.java
new file mode 100644
index 000000000000..97cee6e67521
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlType.java
@@ -0,0 +1,407 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL type item.
+ */
+public class USqlType extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this table and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of type for this type.
+     */
+    @JsonProperty(value = "typeName")
+    private String name;
+
+    /**
+     * the type family for this type.
+     */
+    @JsonProperty(value = "typeFamily")
+    private String typeFamily;
+
+    /**
+     * the C# name for this type.
+     */
+    @JsonProperty(value = "cSharpName")
+    private String cSharpName;
+
+    /**
+     * the fully qualified C# name for this type.
+     */
+    @JsonProperty(value = "fullCSharpName")
+    private String fullCSharpName;
+
+    /**
+     * the system type ID for this type.
+     */
+    @JsonProperty(value = "systemTypeId")
+    private Integer systemTypeId;
+
+    /**
+     * the user type ID for this type.
+     */
+    @JsonProperty(value = "userTypeId")
+    private Integer userTypeId;
+
+    /**
+     * the schema ID for this type.
+     */
+    @JsonProperty(value = "schemaId")
+    private Integer schemaId;
+
+    /**
+     * the principal ID for this type.
+     */
+    @JsonProperty(value = "principalId")
+    private Integer principalId;
+
+    /**
+     * the the switch indicating if this type is nullable.
+     */
+    @JsonProperty(value = "isNullable")
+    private Boolean isNullable;
+
+    /**
+     * the the switch indicating if this type is user defined.
+     */
+    @JsonProperty(value = "isUserDefined")
+    private Boolean isUserDefined;
+
+    /**
+     * the the switch indicating if this type is an assembly type.
+     */
+    @JsonProperty(value = "isAssemblyType")
+    private Boolean isAssemblyType;
+
+    /**
+     * the the switch indicating if this type is a table type.
+     */
+    @JsonProperty(value = "isTableType")
+    private Boolean isTableType;
+
+    /**
+     * the the switch indicating if this type is a complex type.
+     */
+    @JsonProperty(value = "isComplexType")
+    private Boolean isComplexType;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this table and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this table and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of type for this type.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of type for this type.
+     *
+     * @param name the name value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the type family for this type.
+     *
+     * @return the typeFamily value
+     */
+    public String typeFamily() {
+        return this.typeFamily;
+    }
+
+    /**
+     * Set the type family for this type.
+     *
+     * @param typeFamily the typeFamily value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withTypeFamily(String typeFamily) {
+        this.typeFamily = typeFamily;
+        return this;
+    }
+
+    /**
+     * Get the C# name for this type.
+     *
+     * @return the cSharpName value
+     */
+    public String cSharpName() {
+        return this.cSharpName;
+    }
+
+    /**
+     * Set the C# name for this type.
+     *
+     * @param cSharpName the cSharpName value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withCSharpName(String cSharpName) {
+        this.cSharpName = cSharpName;
+        return this;
+    }
+
+    /**
+     * Get the fully qualified C# name for this type.
+     *
+     * @return the fullCSharpName value
+     */
+    public String fullCSharpName() {
+        return this.fullCSharpName;
+    }
+
+    /**
+     * Set the fully qualified C# name for this type.
+     *
+     * @param fullCSharpName the fullCSharpName value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withFullCSharpName(String fullCSharpName) {
+        this.fullCSharpName = fullCSharpName;
+        return this;
+    }
+
+    /**
+     * Get the system type ID for this type.
+     *
+     * @return the systemTypeId value
+     */
+    public Integer systemTypeId() {
+        return this.systemTypeId;
+    }
+
+    /**
+     * Set the system type ID for this type.
+     *
+     * @param systemTypeId the systemTypeId value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withSystemTypeId(Integer systemTypeId) {
+        this.systemTypeId = systemTypeId;
+        return this;
+    }
+
+    /**
+     * Get the user type ID for this type.
+     *
+     * @return the userTypeId value
+     */
+    public Integer userTypeId() {
+        return this.userTypeId;
+    }
+
+    /**
+     * Set the user type ID for this type.
+     *
+     * @param userTypeId the userTypeId value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withUserTypeId(Integer userTypeId) {
+        this.userTypeId = userTypeId;
+        return this;
+    }
+
+    /**
+     * Get the schema ID for this type.
+     *
+     * @return the schemaId value
+     */
+    public Integer schemaId() {
+        return this.schemaId;
+    }
+
+    /**
+     * Set the schema ID for this type.
+     *
+     * @param schemaId the schemaId value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withSchemaId(Integer schemaId) {
+        this.schemaId = schemaId;
+        return this;
+    }
+
+    /**
+     * Get the principal ID for this type.
+     *
+     * @return the principalId value
+     */
+    public Integer principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Set the principal ID for this type.
+     *
+     * @param principalId the principalId value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withPrincipalId(Integer principalId) {
+        this.principalId = principalId;
+        return this;
+    }
+
+    /**
+     * Get the the switch indicating if this type is nullable.
+     *
+     * @return the isNullable value
+     */
+    public Boolean isNullable() {
+        return this.isNullable;
+    }
+
+    /**
+     * Set the the switch indicating if this type is nullable.
+     *
+     * @param isNullable the isNullable value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withIsNullable(Boolean isNullable) {
+        this.isNullable = isNullable;
+        return this;
+    }
+
+    /**
+     * Get the the switch indicating if this type is user defined.
+     *
+     * @return the isUserDefined value
+     */
+    public Boolean isUserDefined() {
+        return this.isUserDefined;
+    }
+
+    /**
+     * Set the the switch indicating if this type is user defined.
+     *
+     * @param isUserDefined the isUserDefined value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withIsUserDefined(Boolean isUserDefined) {
+        this.isUserDefined = isUserDefined;
+        return this;
+    }
+
+    /**
+     * Get the the switch indicating if this type is an assembly type.
+     *
+     * @return the isAssemblyType value
+     */
+    public Boolean isAssemblyType() {
+        return this.isAssemblyType;
+    }
+
+    /**
+     * Set the the switch indicating if this type is an assembly type.
+     *
+     * @param isAssemblyType the isAssemblyType value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withIsAssemblyType(Boolean isAssemblyType) {
+        this.isAssemblyType = isAssemblyType;
+        return this;
+    }
+
+    /**
+     * Get the the switch indicating if this type is a table type.
+     *
+     * @return the isTableType value
+     */
+    public Boolean isTableType() {
+        return this.isTableType;
+    }
+
+    /**
+     * Set the the switch indicating if this type is a table type.
+     *
+     * @param isTableType the isTableType value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withIsTableType(Boolean isTableType) {
+        this.isTableType = isTableType;
+        return this;
+    }
+
+    /**
+     * Get the the switch indicating if this type is a complex type.
+     *
+     * @return the isComplexType value
+     */
+    public Boolean isComplexType() {
+        return this.isComplexType;
+    }
+
+    /**
+     * Set the the switch indicating if this type is a complex type.
+     *
+     * @param isComplexType the isComplexType value to set
+     * @return the USqlType object itself.
+     */
+    public USqlType withIsComplexType(Boolean isComplexType) {
+        this.isComplexType = isComplexType;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlView.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlView.java
new file mode 100644
index 000000000000..f2b02dcb99b4
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/USqlView.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A Data Lake Analytics catalog U-SQL view item.
+ */
+public class USqlView extends CatalogItem {
+    /**
+     * the name of the database.
+     */
+    @JsonProperty(value = "databaseName")
+    private String databaseName;
+
+    /**
+     * the name of the schema associated with this view and database.
+     */
+    @JsonProperty(value = "schemaName")
+    private String schemaName;
+
+    /**
+     * the name of the view.
+     */
+    @JsonProperty(value = "viewName")
+    private String name;
+
+    /**
+     * the defined query of the view.
+     */
+    @JsonProperty(value = "definition")
+    private String definition;
+
+    /**
+     * Get the name of the database.
+     *
+     * @return the databaseName value
+     */
+    public String databaseName() {
+        return this.databaseName;
+    }
+
+    /**
+     * Set the name of the database.
+     *
+     * @param databaseName the databaseName value to set
+     * @return the USqlView object itself.
+     */
+    public USqlView withDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    /**
+     * Get the name of the schema associated with this view and database.
+     *
+     * @return the schemaName value
+     */
+    public String schemaName() {
+        return this.schemaName;
+    }
+
+    /**
+     * Set the name of the schema associated with this view and database.
+     *
+     * @param schemaName the schemaName value to set
+     * @return the USqlView object itself.
+     */
+    public USqlView withSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+        return this;
+    }
+
+    /**
+     * Get the name of the view.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the view.
+     *
+     * @param name the name value to set
+     * @return the USqlView object itself.
+     */
+    public USqlView withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the defined query of the view.
+     *
+     * @return the definition value
+     */
+    public String definition() {
+        return this.definition;
+    }
+
+    /**
+     * Set the defined query of the view.
+     *
+     * @param definition the definition value to set
+     * @return the USqlView object itself.
+     */
+    public USqlView withDefinition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/UpdateJobParameters.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/UpdateJobParameters.java
new file mode 100644
index 000000000000..245a31c73774
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/UpdateJobParameters.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.datalake.analytics.models;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters that can be used to update existing Data Lake Analytics job
+ * information properties. (Only for use internally with Scope job type.).
+ */
+public class UpdateJobParameters {
+    /**
+     * The degree of parallelism used for this job.
+     */
+    @JsonProperty(value = "degreeOfParallelism")
+    private Integer degreeOfParallelism;
+
+    /**
+     * the degree of parallelism in percentage used for this job.
+     */
+    @JsonProperty(value = "degreeOfParallelismPercent")
+    private Double degreeOfParallelismPercent;
+
+    /**
+     * The priority value for the current job. Lower numbers have a higher
+     * priority. By default, a job has a priority of 1000. This must be greater
+     * than 0.
+     */
+    @JsonProperty(value = "priority")
+    private Integer priority;
+
+    /**
+     * The key-value pairs used to add additional metadata to the job
+     * information.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Get the degree of parallelism used for this job.
+     *
+     * @return the degreeOfParallelism value
+     */
+    public Integer degreeOfParallelism() {
+        return this.degreeOfParallelism;
+    }
+
+    /**
+     * Set the degree of parallelism used for this job.
+     *
+     * @param degreeOfParallelism the degreeOfParallelism value to set
+     * @return the UpdateJobParameters object itself.
+     */
+    public UpdateJobParameters withDegreeOfParallelism(Integer degreeOfParallelism) {
+        this.degreeOfParallelism = degreeOfParallelism;
+        return this;
+    }
+
+    /**
+     * Get the degree of parallelism in percentage used for this job.
+     *
+     * @return the degreeOfParallelismPercent value
+     */
+    public Double degreeOfParallelismPercent() {
+        return this.degreeOfParallelismPercent;
+    }
+
+    /**
+     * Set the degree of parallelism in percentage used for this job.
+     *
+     * @param degreeOfParallelismPercent the degreeOfParallelismPercent value to set
+     * @return the UpdateJobParameters object itself.
+     */
+    public UpdateJobParameters withDegreeOfParallelismPercent(Double degreeOfParallelismPercent) {
+        this.degreeOfParallelismPercent = degreeOfParallelismPercent;
+        return this;
+    }
+
+    /**
+     * Get the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @return the priority value
+     */
+    public Integer priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0.
+     *
+     * @param priority the priority value to set
+     * @return the UpdateJobParameters object itself.
+     */
+    public UpdateJobParameters withPriority(Integer priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the key-value pairs used to add additional metadata to the job information.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the key-value pairs used to add additional metadata to the job information.
+     *
+     * @param tags the tags value to set
+     * @return the UpdateJobParameters object itself.
+     */
+    public UpdateJobParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+}
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/package-info.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/package-info.java
new file mode 100644
index 000000000000..3cfd565f6ead
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/models/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the models classes for DataLakeAnalyticsCatalogManagementClient.
+ * Creates an Azure Data Lake Analytics catalog client.
+ */
+package com.microsoft.azure.datalake.analytics.models;
diff --git a/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/package-info.java b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/package-info.java
new file mode 100644
index 000000000000..4e17e437c53f
--- /dev/null
+++ b/azure-datalake/analytics/src/main/java/com/microsoft/azure/datalake/analytics/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for DataLakeAnalyticsCatalogManagementClient.
+ * Creates an Azure Data Lake Analytics catalog client.
+ */
+package com.microsoft.azure.datalake.analytics;
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/AzureEntityResource.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/AzureEntityResource.java
new file mode 100644
index 000000000000..82f73dd0447b
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/AzureEntityResource.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The resource model definition for a Azure Resource Manager resource with an
+ * etag.
+ */
+public class AzureEntityResource extends ProxyResource {
+    /**
+     * Resource Etag.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get resource Etag.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/BackupRequest.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/BackupRequest.java
new file mode 100644
index 000000000000..8b70e0af1e3b
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/BackupRequest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Backup request.
+ */
+public class BackupRequest {
+    /**
+     * Azure File Share.
+     */
+    @JsonProperty(value = "azureFileShare")
+    private String azureFileShare;
+
+    /**
+     * Get azure File Share.
+     *
+     * @return the azureFileShare value
+     */
+    public String azureFileShare() {
+        return this.azureFileShare;
+    }
+
+    /**
+     * Set azure File Share.
+     *
+     * @param azureFileShare the azureFileShare value to set
+     * @return the BackupRequest object itself.
+     */
+    public BackupRequest withAzureFileShare(String azureFileShare) {
+        this.azureFileShare = azureFileShare;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CheckNameAvailabilityParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CheckNameAvailabilityParameters.java
new file mode 100644
index 000000000000..c8e00f36a0af
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CheckNameAvailabilityParameters.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters for a check name availability request.
+ */
+public class CheckNameAvailabilityParameters {
+    /**
+     * The name to check for availability.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * The resource type. Must be set to
+     * Microsoft.StorageSync/storageSyncServices.
+     */
+    @JsonProperty(value = "type", required = true)
+    private String type;
+
+    /**
+     * Creates an instance of CheckNameAvailabilityParameters class.
+     * @param name the name to check for availability.
+     */
+    public CheckNameAvailabilityParameters() {
+        type = "Microsoft.StorageSync/storageSyncServices";
+    }
+
+    /**
+     * Get the name to check for availability.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name to check for availability.
+     *
+     * @param name the name value to set
+     * @return the CheckNameAvailabilityParameters object itself.
+     */
+    public CheckNameAvailabilityParameters withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the resource type. Must be set to Microsoft.StorageSync/storageSyncServices.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set the resource type. Must be set to Microsoft.StorageSync/storageSyncServices.
+     *
+     * @param type the type value to set
+     * @return the CheckNameAvailabilityParameters object itself.
+     */
+    public CheckNameAvailabilityParameters withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointCreateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointCreateParameters.java
new file mode 100644
index 000000000000..185e3b960efa
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointCreateParameters.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The parameters used when creating a storage sync service.
+ */
+@JsonFlatten
+public class CloudEndpointCreateParameters {
+    /**
+     * Required. Gets or sets the location of the resource. This will be one of
+     * the supported and registered Azure Geo Regions (e.g. West US, East US,
+     * Southeast Asia, etc.). The geo region of a resource cannot be changed
+     * once it is created, but if an identical geo region is specified on
+     * update, the request will succeed.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Gets or sets a list of key value pairs that describe the resource. These
+     * tags can be used for viewing and grouping this resource (across resource
+     * groups). A maximum of 15 tags can be provided for a resource. Each tag
+     * must have a key with a length no greater than 128 characters and a value
+     * with a length no greater than 256 characters.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Storage Account Resource Id.
+     */
+    @JsonProperty(value = "properties.storageAccountResourceId")
+    private String storageAccountResourceId;
+
+    /**
+     * Storage Account Share name.
+     */
+    @JsonProperty(value = "properties.storageAccountShareName")
+    private String storageAccountShareName;
+
+    /**
+     * Storage Account Tenant Id.
+     */
+    @JsonProperty(value = "properties.storageAccountTenantId")
+    private String storageAccountTenantId;
+
+    /**
+     * Get required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointCreateParameters object itself.
+     */
+    public CloudEndpointCreateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @param tags the tags value to set
+     * @return the CloudEndpointCreateParameters object itself.
+     */
+    public CloudEndpointCreateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get storage Account Resource Id.
+     *
+     * @return the storageAccountResourceId value
+     */
+    public String storageAccountResourceId() {
+        return this.storageAccountResourceId;
+    }
+
+    /**
+     * Set storage Account Resource Id.
+     *
+     * @param storageAccountResourceId the storageAccountResourceId value to set
+     * @return the CloudEndpointCreateParameters object itself.
+     */
+    public CloudEndpointCreateParameters withStorageAccountResourceId(String storageAccountResourceId) {
+        this.storageAccountResourceId = storageAccountResourceId;
+        return this;
+    }
+
+    /**
+     * Get storage Account Share name.
+     *
+     * @return the storageAccountShareName value
+     */
+    public String storageAccountShareName() {
+        return this.storageAccountShareName;
+    }
+
+    /**
+     * Set storage Account Share name.
+     *
+     * @param storageAccountShareName the storageAccountShareName value to set
+     * @return the CloudEndpointCreateParameters object itself.
+     */
+    public CloudEndpointCreateParameters withStorageAccountShareName(String storageAccountShareName) {
+        this.storageAccountShareName = storageAccountShareName;
+        return this;
+    }
+
+    /**
+     * Get storage Account Tenant Id.
+     *
+     * @return the storageAccountTenantId value
+     */
+    public String storageAccountTenantId() {
+        return this.storageAccountTenantId;
+    }
+
+    /**
+     * Set storage Account Tenant Id.
+     *
+     * @param storageAccountTenantId the storageAccountTenantId value to set
+     * @return the CloudEndpointCreateParameters object itself.
+     */
+    public CloudEndpointCreateParameters withStorageAccountTenantId(String storageAccountTenantId) {
+        this.storageAccountTenantId = storageAccountTenantId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsCreateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsCreateHeaders.java
new file mode 100644
index 000000000000..2ca42b8d5b21
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsCreateHeaders.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Create operation.
+ */
+public class CloudEndpointsCreateHeaders {
+    /**
+     * Request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Azure-AsyncOperation")
+    private String azureAsyncOperation;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Retry After.
+     */
+    @JsonProperty(value = "Retry-After")
+    private String retryAfter;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsCreateHeaders object itself.
+     */
+    public CloudEndpointsCreateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsCreateHeaders object itself.
+     */
+    public CloudEndpointsCreateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the azureAsyncOperation value
+     */
+    public String azureAsyncOperation() {
+        return this.azureAsyncOperation;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param azureAsyncOperation the azureAsyncOperation value to set
+     * @return the CloudEndpointsCreateHeaders object itself.
+     */
+    public CloudEndpointsCreateHeaders withAzureAsyncOperation(String azureAsyncOperation) {
+        this.azureAsyncOperation = azureAsyncOperation;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsCreateHeaders object itself.
+     */
+    public CloudEndpointsCreateHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get retry After.
+     *
+     * @return the retryAfter value
+     */
+    public String retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set retry After.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the CloudEndpointsCreateHeaders object itself.
+     */
+    public CloudEndpointsCreateHeaders withRetryAfter(String retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsDeleteHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsDeleteHeaders.java
new file mode 100644
index 000000000000..32a1851bfa20
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsDeleteHeaders.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Delete operation.
+ */
+public class CloudEndpointsDeleteHeaders {
+    /**
+     * Request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Azure-AsyncOperation")
+    private String azureAsyncOperation;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Retry After.
+     */
+    @JsonProperty(value = "Retry-After")
+    private String retryAfter;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsDeleteHeaders object itself.
+     */
+    public CloudEndpointsDeleteHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsDeleteHeaders object itself.
+     */
+    public CloudEndpointsDeleteHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the azureAsyncOperation value
+     */
+    public String azureAsyncOperation() {
+        return this.azureAsyncOperation;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param azureAsyncOperation the azureAsyncOperation value to set
+     * @return the CloudEndpointsDeleteHeaders object itself.
+     */
+    public CloudEndpointsDeleteHeaders withAzureAsyncOperation(String azureAsyncOperation) {
+        this.azureAsyncOperation = azureAsyncOperation;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsDeleteHeaders object itself.
+     */
+    public CloudEndpointsDeleteHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get retry After.
+     *
+     * @return the retryAfter value
+     */
+    public String retryAfter() {
+        return this.retryAfter;
+    }
+
+    /**
+     * Set retry After.
+     *
+     * @param retryAfter the retryAfter value to set
+     * @return the CloudEndpointsDeleteHeaders object itself.
+     */
+    public CloudEndpointsDeleteHeaders withRetryAfter(String retryAfter) {
+        this.retryAfter = retryAfter;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsGetHeaders.java
new file mode 100644
index 000000000000..c40d97a7af43
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class CloudEndpointsGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsGetHeaders object itself.
+     */
+    public CloudEndpointsGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsGetHeaders object itself.
+     */
+    public CloudEndpointsGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsListBySyncGroupHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsListBySyncGroupHeaders.java
new file mode 100644
index 000000000000..6fc1569155fd
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsListBySyncGroupHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListBySyncGroup operation.
+ */
+public class CloudEndpointsListBySyncGroupHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsListBySyncGroupHeaders object itself.
+     */
+    public CloudEndpointsListBySyncGroupHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsListBySyncGroupHeaders object itself.
+     */
+    public CloudEndpointsListBySyncGroupHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostBackupHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostBackupHeaders.java
new file mode 100644
index 000000000000..2aa8839f35af
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostBackupHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for PostBackup operation.
+ */
+public class CloudEndpointsPostBackupHeaders {
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsPostBackupHeaders object itself.
+     */
+    public CloudEndpointsPostBackupHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsPostBackupHeaders object itself.
+     */
+    public CloudEndpointsPostBackupHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsPostBackupHeaders object itself.
+     */
+    public CloudEndpointsPostBackupHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostRestoreHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostRestoreHeaders.java
new file mode 100644
index 000000000000..3b7883bc9c41
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPostRestoreHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for PostRestore operation.
+ */
+public class CloudEndpointsPostRestoreHeaders {
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsPostRestoreHeaders object itself.
+     */
+    public CloudEndpointsPostRestoreHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsPostRestoreHeaders object itself.
+     */
+    public CloudEndpointsPostRestoreHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsPostRestoreHeaders object itself.
+     */
+    public CloudEndpointsPostRestoreHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreBackupHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreBackupHeaders.java
new file mode 100644
index 000000000000..84796ad49fca
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreBackupHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for PreBackup operation.
+ */
+public class CloudEndpointsPreBackupHeaders {
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsPreBackupHeaders object itself.
+     */
+    public CloudEndpointsPreBackupHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsPreBackupHeaders object itself.
+     */
+    public CloudEndpointsPreBackupHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsPreBackupHeaders object itself.
+     */
+    public CloudEndpointsPreBackupHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreRestoreHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreRestoreHeaders.java
new file mode 100644
index 000000000000..6662939cfba5
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsPreRestoreHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for PreRestore operation.
+ */
+public class CloudEndpointsPreRestoreHeaders {
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the CloudEndpointsPreRestoreHeaders object itself.
+     */
+    public CloudEndpointsPreRestoreHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsPreRestoreHeaders object itself.
+     */
+    public CloudEndpointsPreRestoreHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsPreRestoreHeaders object itself.
+     */
+    public CloudEndpointsPreRestoreHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsRestoreheartbeatHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsRestoreheartbeatHeaders.java
new file mode 100644
index 000000000000..ef8ca834a81e
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/CloudEndpointsRestoreheartbeatHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for restoreheartbeat operation.
+ */
+public class CloudEndpointsRestoreheartbeatHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the CloudEndpointsRestoreheartbeatHeaders object itself.
+     */
+    public CloudEndpointsRestoreheartbeatHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the CloudEndpointsRestoreheartbeatHeaders object itself.
+     */
+    public CloudEndpointsRestoreheartbeatHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/NameAvailabilityReason.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/NameAvailabilityReason.java
new file mode 100644
index 000000000000..ef05cfba23aa
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/NameAvailabilityReason.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for NameAvailabilityReason.
+ */
+public enum NameAvailabilityReason {
+    /** Enum value Invalid. */
+    INVALID("Invalid"),
+
+    /** Enum value AlreadyExists. */
+    ALREADY_EXISTS("AlreadyExists");
+
+    /** The actual serialized value for a NameAvailabilityReason instance. */
+    private String value;
+
+    NameAvailabilityReason(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a NameAvailabilityReason instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed NameAvailabilityReason object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static NameAvailabilityReason fromString(String value) {
+        NameAvailabilityReason[] items = NameAvailabilityReason.values();
+        for (NameAvailabilityReason item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayInfo.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayInfo.java
new file mode 100644
index 000000000000..353e1bb32821
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayInfo.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The operation supported by storage sync.
+ */
+public class OperationDisplayInfo {
+    /**
+     * The description of the operation.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * The action that users can perform, based on their permission level.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Service provider: Microsoft StorageSync.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Get the description of the operation.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the description of the operation.
+     *
+     * @param description the description value to set
+     * @return the OperationDisplayInfo object itself.
+     */
+    public OperationDisplayInfo withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get the action that users can perform, based on their permission level.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set the action that users can perform, based on their permission level.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplayInfo object itself.
+     */
+    public OperationDisplayInfo withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    /**
+     * Get service provider: Microsoft StorageSync.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set service provider: Microsoft StorageSync.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplayInfo object itself.
+     */
+    public OperationDisplayInfo withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get resource on which the operation is performed.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set resource on which the operation is performed.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplayInfo object itself.
+     */
+    public OperationDisplayInfo withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayResource.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayResource.java
new file mode 100644
index 000000000000..6c1199f7f53d
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationDisplayResource.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Operation Display Resource object.
+ */
+public class OperationDisplayResource {
+    /**
+     * Operation Display Resource Provider.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Operation Display Resource.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Operation Display Resource Operation.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Operation Display Resource Description.
+     */
+    @JsonProperty(value = "description")
+    private String description;
+
+    /**
+     * Get operation Display Resource Provider.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set operation Display Resource Provider.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplayResource object itself.
+     */
+    public OperationDisplayResource withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get operation Display Resource.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set operation Display Resource.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplayResource object itself.
+     */
+    public OperationDisplayResource withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    /**
+     * Get operation Display Resource Operation.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set operation Display Resource Operation.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplayResource object itself.
+     */
+    public OperationDisplayResource withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    /**
+     * Get operation Display Resource Description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set operation Display Resource Description.
+     *
+     * @param description the description value to set
+     * @return the OperationDisplayResource object itself.
+     */
+    public OperationDisplayResource withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationsListHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationsListHeaders.java
new file mode 100644
index 000000000000..22758df10aa7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/OperationsListHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for List operation.
+ */
+public class OperationsListHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the OperationsListHeaders object itself.
+     */
+    public OperationsListHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the OperationsListHeaders object itself.
+     */
+    public OperationsListHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PostRestoreRequest.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PostRestoreRequest.java
new file mode 100644
index 000000000000..f8a86cd6d82f
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PostRestoreRequest.java
@@ -0,0 +1,226 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Post Restore Request.
+ */
+public class PostRestoreRequest {
+    /**
+     * Post Restore partition.
+     */
+    @JsonProperty(value = "partition")
+    private String partition;
+
+    /**
+     * Post Restore replica group.
+     */
+    @JsonProperty(value = "replicaGroup")
+    private String replicaGroup;
+
+    /**
+     * Post Restore request id.
+     */
+    @JsonProperty(value = "requestId")
+    private String requestId;
+
+    /**
+     * Post Restore Azure file share uri.
+     */
+    @JsonProperty(value = "azureFileShareUri")
+    private String azureFileShareUri;
+
+    /**
+     * Post Restore Azure status.
+     */
+    @JsonProperty(value = "status")
+    private String status;
+
+    /**
+     * Post Restore Azure source azure file share uri.
+     */
+    @JsonProperty(value = "sourceAzureFileShareUri")
+    private String sourceAzureFileShareUri;
+
+    /**
+     * Post Restore Azure failed file list.
+     */
+    @JsonProperty(value = "failedFileList")
+    private String failedFileList;
+
+    /**
+     * Post Restore restore file spec array.
+     */
+    @JsonProperty(value = "restoreFileSpec")
+    private List<RestoreFileSpec> restoreFileSpec;
+
+    /**
+     * Get post Restore partition.
+     *
+     * @return the partition value
+     */
+    public String partition() {
+        return this.partition;
+    }
+
+    /**
+     * Set post Restore partition.
+     *
+     * @param partition the partition value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withPartition(String partition) {
+        this.partition = partition;
+        return this;
+    }
+
+    /**
+     * Get post Restore replica group.
+     *
+     * @return the replicaGroup value
+     */
+    public String replicaGroup() {
+        return this.replicaGroup;
+    }
+
+    /**
+     * Set post Restore replica group.
+     *
+     * @param replicaGroup the replicaGroup value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withReplicaGroup(String replicaGroup) {
+        this.replicaGroup = replicaGroup;
+        return this;
+    }
+
+    /**
+     * Get post Restore request id.
+     *
+     * @return the requestId value
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set post Restore request id.
+     *
+     * @param requestId the requestId value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withRequestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get post Restore Azure file share uri.
+     *
+     * @return the azureFileShareUri value
+     */
+    public String azureFileShareUri() {
+        return this.azureFileShareUri;
+    }
+
+    /**
+     * Set post Restore Azure file share uri.
+     *
+     * @param azureFileShareUri the azureFileShareUri value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withAzureFileShareUri(String azureFileShareUri) {
+        this.azureFileShareUri = azureFileShareUri;
+        return this;
+    }
+
+    /**
+     * Get post Restore Azure status.
+     *
+     * @return the status value
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set post Restore Azure status.
+     *
+     * @param status the status value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get post Restore Azure source azure file share uri.
+     *
+     * @return the sourceAzureFileShareUri value
+     */
+    public String sourceAzureFileShareUri() {
+        return this.sourceAzureFileShareUri;
+    }
+
+    /**
+     * Set post Restore Azure source azure file share uri.
+     *
+     * @param sourceAzureFileShareUri the sourceAzureFileShareUri value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withSourceAzureFileShareUri(String sourceAzureFileShareUri) {
+        this.sourceAzureFileShareUri = sourceAzureFileShareUri;
+        return this;
+    }
+
+    /**
+     * Get post Restore Azure failed file list.
+     *
+     * @return the failedFileList value
+     */
+    public String failedFileList() {
+        return this.failedFileList;
+    }
+
+    /**
+     * Set post Restore Azure failed file list.
+     *
+     * @param failedFileList the failedFileList value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withFailedFileList(String failedFileList) {
+        this.failedFileList = failedFileList;
+        return this;
+    }
+
+    /**
+     * Get post Restore restore file spec array.
+     *
+     * @return the restoreFileSpec value
+     */
+    public List<RestoreFileSpec> restoreFileSpec() {
+        return this.restoreFileSpec;
+    }
+
+    /**
+     * Set post Restore restore file spec array.
+     *
+     * @param restoreFileSpec the restoreFileSpec value to set
+     * @return the PostRestoreRequest object itself.
+     */
+    public PostRestoreRequest withRestoreFileSpec(List<RestoreFileSpec> restoreFileSpec) {
+        this.restoreFileSpec = restoreFileSpec;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PreRestoreRequest.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PreRestoreRequest.java
new file mode 100644
index 000000000000..db4b20ddbed9
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/PreRestoreRequest.java
@@ -0,0 +1,252 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Pre Restore request object.
+ */
+public class PreRestoreRequest {
+    /**
+     * Pre Restore partition.
+     */
+    @JsonProperty(value = "partition")
+    private String partition;
+
+    /**
+     * Pre Restore replica group.
+     */
+    @JsonProperty(value = "replicaGroup")
+    private String replicaGroup;
+
+    /**
+     * Pre Restore request id.
+     */
+    @JsonProperty(value = "requestId")
+    private String requestId;
+
+    /**
+     * Pre Restore Azure file share uri.
+     */
+    @JsonProperty(value = "azureFileShareUri")
+    private String azureFileShareUri;
+
+    /**
+     * Pre Restore Azure status.
+     */
+    @JsonProperty(value = "status")
+    private String status;
+
+    /**
+     * Pre Restore Azure source azure file share uri.
+     */
+    @JsonProperty(value = "sourceAzureFileShareUri")
+    private String sourceAzureFileShareUri;
+
+    /**
+     * Pre Restore backup metadata property bag.
+     */
+    @JsonProperty(value = "backupMetadataPropertyBag")
+    private String backupMetadataPropertyBag;
+
+    /**
+     * Pre Restore restore file spec array.
+     */
+    @JsonProperty(value = "restoreFileSpec")
+    private List<RestoreFileSpec> restoreFileSpec;
+
+    /**
+     * Pre Restore pause wait for sync drain time period in seconds.
+     */
+    @JsonProperty(value = "pauseWaitForSyncDrainTimePeriodInSeconds")
+    private Integer pauseWaitForSyncDrainTimePeriodInSeconds;
+
+    /**
+     * Get pre Restore partition.
+     *
+     * @return the partition value
+     */
+    public String partition() {
+        return this.partition;
+    }
+
+    /**
+     * Set pre Restore partition.
+     *
+     * @param partition the partition value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withPartition(String partition) {
+        this.partition = partition;
+        return this;
+    }
+
+    /**
+     * Get pre Restore replica group.
+     *
+     * @return the replicaGroup value
+     */
+    public String replicaGroup() {
+        return this.replicaGroup;
+    }
+
+    /**
+     * Set pre Restore replica group.
+     *
+     * @param replicaGroup the replicaGroup value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withReplicaGroup(String replicaGroup) {
+        this.replicaGroup = replicaGroup;
+        return this;
+    }
+
+    /**
+     * Get pre Restore request id.
+     *
+     * @return the requestId value
+     */
+    public String requestId() {
+        return this.requestId;
+    }
+
+    /**
+     * Set pre Restore request id.
+     *
+     * @param requestId the requestId value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withRequestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+    /**
+     * Get pre Restore Azure file share uri.
+     *
+     * @return the azureFileShareUri value
+     */
+    public String azureFileShareUri() {
+        return this.azureFileShareUri;
+    }
+
+    /**
+     * Set pre Restore Azure file share uri.
+     *
+     * @param azureFileShareUri the azureFileShareUri value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withAzureFileShareUri(String azureFileShareUri) {
+        this.azureFileShareUri = azureFileShareUri;
+        return this;
+    }
+
+    /**
+     * Get pre Restore Azure status.
+     *
+     * @return the status value
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set pre Restore Azure status.
+     *
+     * @param status the status value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get pre Restore Azure source azure file share uri.
+     *
+     * @return the sourceAzureFileShareUri value
+     */
+    public String sourceAzureFileShareUri() {
+        return this.sourceAzureFileShareUri;
+    }
+
+    /**
+     * Set pre Restore Azure source azure file share uri.
+     *
+     * @param sourceAzureFileShareUri the sourceAzureFileShareUri value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withSourceAzureFileShareUri(String sourceAzureFileShareUri) {
+        this.sourceAzureFileShareUri = sourceAzureFileShareUri;
+        return this;
+    }
+
+    /**
+     * Get pre Restore backup metadata property bag.
+     *
+     * @return the backupMetadataPropertyBag value
+     */
+    public String backupMetadataPropertyBag() {
+        return this.backupMetadataPropertyBag;
+    }
+
+    /**
+     * Set pre Restore backup metadata property bag.
+     *
+     * @param backupMetadataPropertyBag the backupMetadataPropertyBag value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withBackupMetadataPropertyBag(String backupMetadataPropertyBag) {
+        this.backupMetadataPropertyBag = backupMetadataPropertyBag;
+        return this;
+    }
+
+    /**
+     * Get pre Restore restore file spec array.
+     *
+     * @return the restoreFileSpec value
+     */
+    public List<RestoreFileSpec> restoreFileSpec() {
+        return this.restoreFileSpec;
+    }
+
+    /**
+     * Set pre Restore restore file spec array.
+     *
+     * @param restoreFileSpec the restoreFileSpec value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withRestoreFileSpec(List<RestoreFileSpec> restoreFileSpec) {
+        this.restoreFileSpec = restoreFileSpec;
+        return this;
+    }
+
+    /**
+     * Get pre Restore pause wait for sync drain time period in seconds.
+     *
+     * @return the pauseWaitForSyncDrainTimePeriodInSeconds value
+     */
+    public Integer pauseWaitForSyncDrainTimePeriodInSeconds() {
+        return this.pauseWaitForSyncDrainTimePeriodInSeconds;
+    }
+
+    /**
+     * Set pre Restore pause wait for sync drain time period in seconds.
+     *
+     * @param pauseWaitForSyncDrainTimePeriodInSeconds the pauseWaitForSyncDrainTimePeriodInSeconds value to set
+     * @return the PreRestoreRequest object itself.
+     */
+    public PreRestoreRequest withPauseWaitForSyncDrainTimePeriodInSeconds(Integer pauseWaitForSyncDrainTimePeriodInSeconds) {
+        this.pauseWaitForSyncDrainTimePeriodInSeconds = pauseWaitForSyncDrainTimePeriodInSeconds;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/Reason.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/Reason.java
new file mode 100644
index 000000000000..6d2b38e4bf70
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/Reason.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Reason.
+ */
+public final class Reason extends ExpandableStringEnum<Reason> {
+    /** Static value Registered for Reason. */
+    public static final Reason REGISTERED = fromString("Registered");
+
+    /** Static value Unregistered for Reason. */
+    public static final Reason UNREGISTERED = fromString("Unregistered");
+
+    /** Static value Warned for Reason. */
+    public static final Reason WARNED = fromString("Warned");
+
+    /** Static value Suspended for Reason. */
+    public static final Reason SUSPENDED = fromString("Suspended");
+
+    /** Static value Deleted for Reason. */
+    public static final Reason DELETED = fromString("Deleted");
+
+    /**
+     * Creates or finds a Reason from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Reason
+     */
+    @JsonCreator
+    public static Reason fromString(String name) {
+        return fromString(name, Reason.class);
+    }
+
+    /**
+     * @return known Reason values
+     */
+    public static Collection<Reason> values() {
+        return values(Reason.class);
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RecallActionParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RecallActionParameters.java
new file mode 100644
index 000000000000..2a5cb5d3f307
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RecallActionParameters.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used when calling recall action on server endpoint.
+ */
+public class RecallActionParameters {
+    /**
+     * Pattern of the files.
+     */
+    @JsonProperty(value = "pattern")
+    private String pattern;
+
+    /**
+     * Recall path.
+     */
+    @JsonProperty(value = "recallPath")
+    private String recallPath;
+
+    /**
+     * Get pattern of the files.
+     *
+     * @return the pattern value
+     */
+    public String pattern() {
+        return this.pattern;
+    }
+
+    /**
+     * Set pattern of the files.
+     *
+     * @param pattern the pattern value to set
+     * @return the RecallActionParameters object itself.
+     */
+    public RecallActionParameters withPattern(String pattern) {
+        this.pattern = pattern;
+        return this;
+    }
+
+    /**
+     * Get recall path.
+     *
+     * @return the recallPath value
+     */
+    public String recallPath() {
+        return this.recallPath;
+    }
+
+    /**
+     * Set recall path.
+     *
+     * @param recallPath the recallPath value to set
+     * @return the RecallActionParameters object itself.
+     */
+    public RecallActionParameters withRecallPath(String recallPath) {
+        this.recallPath = recallPath;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServerCreateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServerCreateParameters.java
new file mode 100644
index 000000000000..88de075ab2f7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServerCreateParameters.java
@@ -0,0 +1,314 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The parameters used when creating a storage sync service.
+ */
+@JsonFlatten
+public class RegisteredServerCreateParameters {
+    /**
+     * Required. Gets or sets the location of the resource. This will be one of
+     * the supported and registered Azure Geo Regions (e.g. West US, East US,
+     * Southeast Asia, etc.). The geo region of a resource cannot be changed
+     * once it is created, but if an identical geo region is specified on
+     * update, the request will succeed.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Gets or sets a list of key value pairs that describe the resource. These
+     * tags can be used for viewing and grouping this resource (across resource
+     * groups). A maximum of 15 tags can be provided for a resource. Each tag
+     * must have a key with a length no greater than 128 characters and a value
+     * with a length no greater than 256 characters.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Registered Server Certificate.
+     */
+    @JsonProperty(value = "properties.serverCertificate")
+    private String serverCertificate;
+
+    /**
+     * Registered Server Agent Version.
+     */
+    @JsonProperty(value = "properties.agentVersion")
+    private String agentVersion;
+
+    /**
+     * Registered Server OS Version.
+     */
+    @JsonProperty(value = "properties.serverOSVersion")
+    private String serverOSVersion;
+
+    /**
+     * Registered Server last heart beat.
+     */
+    @JsonProperty(value = "properties.lastHeartBeat")
+    private String lastHeartBeat;
+
+    /**
+     * Registered Server serverRole.
+     */
+    @JsonProperty(value = "properties.serverRole")
+    private String serverRole;
+
+    /**
+     * Registered Server clusterId.
+     */
+    @JsonProperty(value = "properties.clusterId")
+    private String clusterId;
+
+    /**
+     * Registered Server clusterName.
+     */
+    @JsonProperty(value = "properties.clusterName")
+    private String clusterName;
+
+    /**
+     * Registered Server serverId.
+     */
+    @JsonProperty(value = "properties.serverId")
+    private String serverId;
+
+    /**
+     * Friendly Name.
+     */
+    @JsonProperty(value = "properties.friendlyName")
+    private String friendlyName;
+
+    /**
+     * Get required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @param location the location value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @param tags the tags value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get registered Server Certificate.
+     *
+     * @return the serverCertificate value
+     */
+    public String serverCertificate() {
+        return this.serverCertificate;
+    }
+
+    /**
+     * Set registered Server Certificate.
+     *
+     * @param serverCertificate the serverCertificate value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withServerCertificate(String serverCertificate) {
+        this.serverCertificate = serverCertificate;
+        return this;
+    }
+
+    /**
+     * Get registered Server Agent Version.
+     *
+     * @return the agentVersion value
+     */
+    public String agentVersion() {
+        return this.agentVersion;
+    }
+
+    /**
+     * Set registered Server Agent Version.
+     *
+     * @param agentVersion the agentVersion value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withAgentVersion(String agentVersion) {
+        this.agentVersion = agentVersion;
+        return this;
+    }
+
+    /**
+     * Get registered Server OS Version.
+     *
+     * @return the serverOSVersion value
+     */
+    public String serverOSVersion() {
+        return this.serverOSVersion;
+    }
+
+    /**
+     * Set registered Server OS Version.
+     *
+     * @param serverOSVersion the serverOSVersion value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withServerOSVersion(String serverOSVersion) {
+        this.serverOSVersion = serverOSVersion;
+        return this;
+    }
+
+    /**
+     * Get registered Server last heart beat.
+     *
+     * @return the lastHeartBeat value
+     */
+    public String lastHeartBeat() {
+        return this.lastHeartBeat;
+    }
+
+    /**
+     * Set registered Server last heart beat.
+     *
+     * @param lastHeartBeat the lastHeartBeat value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withLastHeartBeat(String lastHeartBeat) {
+        this.lastHeartBeat = lastHeartBeat;
+        return this;
+    }
+
+    /**
+     * Get registered Server serverRole.
+     *
+     * @return the serverRole value
+     */
+    public String serverRole() {
+        return this.serverRole;
+    }
+
+    /**
+     * Set registered Server serverRole.
+     *
+     * @param serverRole the serverRole value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withServerRole(String serverRole) {
+        this.serverRole = serverRole;
+        return this;
+    }
+
+    /**
+     * Get registered Server clusterId.
+     *
+     * @return the clusterId value
+     */
+    public String clusterId() {
+        return this.clusterId;
+    }
+
+    /**
+     * Set registered Server clusterId.
+     *
+     * @param clusterId the clusterId value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withClusterId(String clusterId) {
+        this.clusterId = clusterId;
+        return this;
+    }
+
+    /**
+     * Get registered Server clusterName.
+     *
+     * @return the clusterName value
+     */
+    public String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Set registered Server clusterName.
+     *
+     * @param clusterName the clusterName value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withClusterName(String clusterName) {
+        this.clusterName = clusterName;
+        return this;
+    }
+
+    /**
+     * Get registered Server serverId.
+     *
+     * @return the serverId value
+     */
+    public String serverId() {
+        return this.serverId;
+    }
+
+    /**
+     * Set registered Server serverId.
+     *
+     * @param serverId the serverId value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withServerId(String serverId) {
+        this.serverId = serverId;
+        return this;
+    }
+
+    /**
+     * Get friendly Name.
+     *
+     * @return the friendlyName value
+     */
+    public String friendlyName() {
+        return this.friendlyName;
+    }
+
+    /**
+     * Set friendly Name.
+     *
+     * @param friendlyName the friendlyName value to set
+     * @return the RegisteredServerCreateParameters object itself.
+     */
+    public RegisteredServerCreateParameters withFriendlyName(String friendlyName) {
+        this.friendlyName = friendlyName;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersCreateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersCreateHeaders.java
new file mode 100644
index 000000000000..42509bd54877
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersCreateHeaders.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Create operation.
+ */
+public class RegisteredServersCreateHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Azure-AsyncOperation")
+    private String azureAsyncOperation;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the RegisteredServersCreateHeaders object itself.
+     */
+    public RegisteredServersCreateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the RegisteredServersCreateHeaders object itself.
+     */
+    public RegisteredServersCreateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the azureAsyncOperation value
+     */
+    public String azureAsyncOperation() {
+        return this.azureAsyncOperation;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param azureAsyncOperation the azureAsyncOperation value to set
+     * @return the RegisteredServersCreateHeaders object itself.
+     */
+    public RegisteredServersCreateHeaders withAzureAsyncOperation(String azureAsyncOperation) {
+        this.azureAsyncOperation = azureAsyncOperation;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the RegisteredServersCreateHeaders object itself.
+     */
+    public RegisteredServersCreateHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersDeleteHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersDeleteHeaders.java
new file mode 100644
index 000000000000..3bd44d230ee5
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersDeleteHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Delete operation.
+ */
+public class RegisteredServersDeleteHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the RegisteredServersDeleteHeaders object itself.
+     */
+    public RegisteredServersDeleteHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the RegisteredServersDeleteHeaders object itself.
+     */
+    public RegisteredServersDeleteHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the RegisteredServersDeleteHeaders object itself.
+     */
+    public RegisteredServersDeleteHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersGetHeaders.java
new file mode 100644
index 000000000000..c692fb0d3857
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class RegisteredServersGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the RegisteredServersGetHeaders object itself.
+     */
+    public RegisteredServersGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the RegisteredServersGetHeaders object itself.
+     */
+    public RegisteredServersGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersListByStorageSyncServiceHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersListByStorageSyncServiceHeaders.java
new file mode 100644
index 000000000000..25e86f5fb163
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RegisteredServersListByStorageSyncServiceHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListByStorageSyncService operation.
+ */
+public class RegisteredServersListByStorageSyncServiceHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the RegisteredServersListByStorageSyncServiceHeaders object itself.
+     */
+    public RegisteredServersListByStorageSyncServiceHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the RegisteredServersListByStorageSyncServiceHeaders object itself.
+     */
+    public RegisteredServersListByStorageSyncServiceHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ResourcesMoveInfo.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ResourcesMoveInfo.java
new file mode 100644
index 000000000000..4842520d802d
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ResourcesMoveInfo.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Resource Move Info.
+ */
+public class ResourcesMoveInfo {
+    /**
+     * Target resource group.
+     */
+    @JsonProperty(value = "targetResourceGroup")
+    private String targetResourceGroup;
+
+    /**
+     * Collection of Resources.
+     */
+    @JsonProperty(value = "resources")
+    private List<String> resources;
+
+    /**
+     * Get target resource group.
+     *
+     * @return the targetResourceGroup value
+     */
+    public String targetResourceGroup() {
+        return this.targetResourceGroup;
+    }
+
+    /**
+     * Set target resource group.
+     *
+     * @param targetResourceGroup the targetResourceGroup value to set
+     * @return the ResourcesMoveInfo object itself.
+     */
+    public ResourcesMoveInfo withTargetResourceGroup(String targetResourceGroup) {
+        this.targetResourceGroup = targetResourceGroup;
+        return this;
+    }
+
+    /**
+     * Get collection of Resources.
+     *
+     * @return the resources value
+     */
+    public List<String> resources() {
+        return this.resources;
+    }
+
+    /**
+     * Set collection of Resources.
+     *
+     * @param resources the resources value to set
+     * @return the ResourcesMoveInfo object itself.
+     */
+    public ResourcesMoveInfo withResources(List<String> resources) {
+        this.resources = resources;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RestoreFileSpec.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RestoreFileSpec.java
new file mode 100644
index 000000000000..015aef215163
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/RestoreFileSpec.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Restore file spec.
+ */
+public class RestoreFileSpec {
+    /**
+     * Restore file spec path.
+     */
+    @JsonProperty(value = "path")
+    private String path;
+
+    /**
+     * Restore file spec isdir.
+     */
+    @JsonProperty(value = "isdir", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean isdir;
+
+    /**
+     * Get restore file spec path.
+     *
+     * @return the path value
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set restore file spec path.
+     *
+     * @param path the path value to set
+     * @return the RestoreFileSpec object itself.
+     */
+    public RestoreFileSpec withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get restore file spec isdir.
+     *
+     * @return the isdir value
+     */
+    public Boolean isdir() {
+        return this.isdir;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointCreateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointCreateParameters.java
new file mode 100644
index 000000000000..c015eb5150a0
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointCreateParameters.java
@@ -0,0 +1,210 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * The parameters used when creating a storage sync service.
+ */
+@JsonFlatten
+public class ServerEndpointCreateParameters {
+    /**
+     * Required. Gets or sets the location of the resource. This will be one of
+     * the supported and registered Azure Geo Regions (e.g. West US, East US,
+     * Southeast Asia, etc.). The geo region of a resource cannot be changed
+     * once it is created, but if an identical geo region is specified on
+     * update, the request will succeed.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Gets or sets a list of key value pairs that describe the resource. These
+     * tags can be used for viewing and grouping this resource (across resource
+     * groups). A maximum of 15 tags can be provided for a resource. Each tag
+     * must have a key with a length no greater than 128 characters and a value
+     * with a length no greater than 256 characters.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Server Local path.
+     */
+    @JsonProperty(value = "properties.serverLocalPath")
+    private String serverLocalPath;
+
+    /**
+     * Cloud Tiering. Possible values include: 'on', 'off'.
+     */
+    @JsonProperty(value = "properties.cloudTiering")
+    private String cloudTiering;
+
+    /**
+     * Level of free space to be maintained by Cloud Tiering if it is enabled.
+     */
+    @JsonProperty(value = "properties.volumeFreeSpacePercent")
+    private Integer volumeFreeSpacePercent;
+
+    /**
+     * Friendly Name.
+     */
+    @JsonProperty(value = "properties.friendlyName")
+    private String friendlyName;
+
+    /**
+     * Server Resource Id.
+     */
+    @JsonProperty(value = "properties.serverResourceId")
+    private String serverResourceId;
+
+    /**
+     * Get required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @param tags the tags value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get server Local path.
+     *
+     * @return the serverLocalPath value
+     */
+    public String serverLocalPath() {
+        return this.serverLocalPath;
+    }
+
+    /**
+     * Set server Local path.
+     *
+     * @param serverLocalPath the serverLocalPath value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withServerLocalPath(String serverLocalPath) {
+        this.serverLocalPath = serverLocalPath;
+        return this;
+    }
+
+    /**
+     * Get cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @return the cloudTiering value
+     */
+    public String cloudTiering() {
+        return this.cloudTiering;
+    }
+
+    /**
+     * Set cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @param cloudTiering the cloudTiering value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withCloudTiering(String cloudTiering) {
+        this.cloudTiering = cloudTiering;
+        return this;
+    }
+
+    /**
+     * Get level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @return the volumeFreeSpacePercent value
+     */
+    public Integer volumeFreeSpacePercent() {
+        return this.volumeFreeSpacePercent;
+    }
+
+    /**
+     * Set level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @param volumeFreeSpacePercent the volumeFreeSpacePercent value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withVolumeFreeSpacePercent(Integer volumeFreeSpacePercent) {
+        this.volumeFreeSpacePercent = volumeFreeSpacePercent;
+        return this;
+    }
+
+    /**
+     * Get friendly Name.
+     *
+     * @return the friendlyName value
+     */
+    public String friendlyName() {
+        return this.friendlyName;
+    }
+
+    /**
+     * Set friendly Name.
+     *
+     * @param friendlyName the friendlyName value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withFriendlyName(String friendlyName) {
+        this.friendlyName = friendlyName;
+        return this;
+    }
+
+    /**
+     * Get server Resource Id.
+     *
+     * @return the serverResourceId value
+     */
+    public String serverResourceId() {
+        return this.serverResourceId;
+    }
+
+    /**
+     * Set server Resource Id.
+     *
+     * @param serverResourceId the serverResourceId value to set
+     * @return the ServerEndpointCreateParameters object itself.
+     */
+    public ServerEndpointCreateParameters withServerResourceId(String serverResourceId) {
+        this.serverResourceId = serverResourceId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointUpdateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointUpdateParameters.java
new file mode 100644
index 000000000000..b2bb7fae7011
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointUpdateParameters.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Parameters for updating an Server Endpoint.
+ */
+@JsonFlatten
+public class ServerEndpointUpdateParameters {
+    /**
+     * The user-specified tags associated with the server endpoint.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Cloud Tiering. Possible values include: 'on', 'off'.
+     */
+    @JsonProperty(value = "properties.cloudTiering")
+    private String cloudTiering;
+
+    /**
+     * Level of free space to be maintained by Cloud Tiering if it is enabled.
+     */
+    @JsonProperty(value = "properties.volumeFreeSpacePercent")
+    private Integer volumeFreeSpacePercent;
+
+    /**
+     * Get the user-specified tags associated with the server endpoint.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the user-specified tags associated with the server endpoint.
+     *
+     * @param tags the tags value to set
+     * @return the ServerEndpointUpdateParameters object itself.
+     */
+    public ServerEndpointUpdateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @return the cloudTiering value
+     */
+    public String cloudTiering() {
+        return this.cloudTiering;
+    }
+
+    /**
+     * Set cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @param cloudTiering the cloudTiering value to set
+     * @return the ServerEndpointUpdateParameters object itself.
+     */
+    public ServerEndpointUpdateParameters withCloudTiering(String cloudTiering) {
+        this.cloudTiering = cloudTiering;
+        return this;
+    }
+
+    /**
+     * Get level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @return the volumeFreeSpacePercent value
+     */
+    public Integer volumeFreeSpacePercent() {
+        return this.volumeFreeSpacePercent;
+    }
+
+    /**
+     * Set level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @param volumeFreeSpacePercent the volumeFreeSpacePercent value to set
+     * @return the ServerEndpointUpdateParameters object itself.
+     */
+    public ServerEndpointUpdateParameters withVolumeFreeSpacePercent(Integer volumeFreeSpacePercent) {
+        this.volumeFreeSpacePercent = volumeFreeSpacePercent;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsCreateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsCreateHeaders.java
new file mode 100644
index 000000000000..e5cf0ce61f3d
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsCreateHeaders.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Create operation.
+ */
+public class ServerEndpointsCreateHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Azure-AsyncOperation")
+    private String azureAsyncOperation;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsCreateHeaders object itself.
+     */
+    public ServerEndpointsCreateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsCreateHeaders object itself.
+     */
+    public ServerEndpointsCreateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the azureAsyncOperation value
+     */
+    public String azureAsyncOperation() {
+        return this.azureAsyncOperation;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param azureAsyncOperation the azureAsyncOperation value to set
+     * @return the ServerEndpointsCreateHeaders object itself.
+     */
+    public ServerEndpointsCreateHeaders withAzureAsyncOperation(String azureAsyncOperation) {
+        this.azureAsyncOperation = azureAsyncOperation;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointsCreateHeaders object itself.
+     */
+    public ServerEndpointsCreateHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsDeleteHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsDeleteHeaders.java
new file mode 100644
index 000000000000..734884e49920
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsDeleteHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Delete operation.
+ */
+public class ServerEndpointsDeleteHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsDeleteHeaders object itself.
+     */
+    public ServerEndpointsDeleteHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsDeleteHeaders object itself.
+     */
+    public ServerEndpointsDeleteHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointsDeleteHeaders object itself.
+     */
+    public ServerEndpointsDeleteHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsGetHeaders.java
new file mode 100644
index 000000000000..d87b88afa54a
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class ServerEndpointsGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsGetHeaders object itself.
+     */
+    public ServerEndpointsGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsGetHeaders object itself.
+     */
+    public ServerEndpointsGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsListBySyncGroupHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsListBySyncGroupHeaders.java
new file mode 100644
index 000000000000..6db5d5540c3b
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsListBySyncGroupHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListBySyncGroup operation.
+ */
+public class ServerEndpointsListBySyncGroupHeaders {
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointsListBySyncGroupHeaders object itself.
+     */
+    public ServerEndpointsListBySyncGroupHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsListBySyncGroupHeaders object itself.
+     */
+    public ServerEndpointsListBySyncGroupHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsListBySyncGroupHeaders object itself.
+     */
+    public ServerEndpointsListBySyncGroupHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsRecallActionHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsRecallActionHeaders.java
new file mode 100644
index 000000000000..988d30e021b1
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsRecallActionHeaders.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for recallAction operation.
+ */
+public class ServerEndpointsRecallActionHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsRecallActionHeaders object itself.
+     */
+    public ServerEndpointsRecallActionHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsRecallActionHeaders object itself.
+     */
+    public ServerEndpointsRecallActionHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointsRecallActionHeaders object itself.
+     */
+    public ServerEndpointsRecallActionHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsUpdateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsUpdateHeaders.java
new file mode 100644
index 000000000000..afa291d57d34
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/ServerEndpointsUpdateHeaders.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Update operation.
+ */
+public class ServerEndpointsUpdateHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Azure-AsyncOperation")
+    private String azureAsyncOperation;
+
+    /**
+     * Operation Status Location URI.
+     */
+    @JsonProperty(value = "Location")
+    private String location;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the ServerEndpointsUpdateHeaders object itself.
+     */
+    public ServerEndpointsUpdateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the ServerEndpointsUpdateHeaders object itself.
+     */
+    public ServerEndpointsUpdateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the azureAsyncOperation value
+     */
+    public String azureAsyncOperation() {
+        return this.azureAsyncOperation;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param azureAsyncOperation the azureAsyncOperation value to set
+     * @return the ServerEndpointsUpdateHeaders object itself.
+     */
+    public ServerEndpointsUpdateHeaders withAzureAsyncOperation(String azureAsyncOperation) {
+        this.azureAsyncOperation = azureAsyncOperation;
+        return this;
+    }
+
+    /**
+     * Get operation Status Location URI.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set operation Status Location URI.
+     *
+     * @param location the location value to set
+     * @return the ServerEndpointsUpdateHeaders object itself.
+     */
+    public ServerEndpointsUpdateHeaders withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncApiError.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncApiError.java
new file mode 100644
index 000000000000..52fecec38d17
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncApiError.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error type.
+ */
+public class StorageSyncApiError {
+    /**
+     * Error code of the given entry.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error message of the given entry.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Target of the given error entry.
+     */
+    @JsonProperty(value = "target")
+    private String target;
+
+    /**
+     * Error details of the given entry.
+     */
+    @JsonProperty(value = "details")
+    private StorageSyncErrorDetails details;
+
+    /**
+     * Get error code of the given entry.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set error code of the given entry.
+     *
+     * @param code the code value to set
+     * @return the StorageSyncApiError object itself.
+     */
+    public StorageSyncApiError withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error message of the given entry.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message of the given entry.
+     *
+     * @param message the message value to set
+     * @return the StorageSyncApiError object itself.
+     */
+    public StorageSyncApiError withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Get target of the given error entry.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set target of the given error entry.
+     *
+     * @param target the target value to set
+     * @return the StorageSyncApiError object itself.
+     */
+    public StorageSyncApiError withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * Get error details of the given entry.
+     *
+     * @return the details value
+     */
+    public StorageSyncErrorDetails details() {
+        return this.details;
+    }
+
+    /**
+     * Set error details of the given entry.
+     *
+     * @param details the details value to set
+     * @return the StorageSyncApiError object itself.
+     */
+    public StorageSyncApiError withDetails(StorageSyncErrorDetails details) {
+        this.details = details;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncError.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncError.java
new file mode 100644
index 000000000000..061f30b3eee8
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncError.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error type.
+ */
+public class StorageSyncError {
+    /**
+     * Error details of the given entry.
+     */
+    @JsonProperty(value = "error")
+    private StorageSyncApiError error;
+
+    /**
+     * Error details of the given entry.
+     */
+    @JsonProperty(value = "innererror")
+    private StorageSyncApiError innererror;
+
+    /**
+     * Get error details of the given entry.
+     *
+     * @return the error value
+     */
+    public StorageSyncApiError error() {
+        return this.error;
+    }
+
+    /**
+     * Set error details of the given entry.
+     *
+     * @param error the error value to set
+     * @return the StorageSyncError object itself.
+     */
+    public StorageSyncError withError(StorageSyncApiError error) {
+        this.error = error;
+        return this;
+    }
+
+    /**
+     * Get error details of the given entry.
+     *
+     * @return the innererror value
+     */
+    public StorageSyncApiError innererror() {
+        return this.innererror;
+    }
+
+    /**
+     * Set error details of the given entry.
+     *
+     * @param innererror the innererror value to set
+     * @return the StorageSyncError object itself.
+     */
+    public StorageSyncError withInnererror(StorageSyncApiError innererror) {
+        this.innererror = innererror;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorDetails.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorDetails.java
new file mode 100644
index 000000000000..df0a224eacf2
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorDetails.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error Details object.
+ */
+public class StorageSyncErrorDetails {
+    /**
+     * Error code of the given entry.
+     */
+    @JsonProperty(value = "code")
+    private String code;
+
+    /**
+     * Error message of the given entry.
+     */
+    @JsonProperty(value = "message")
+    private String message;
+
+    /**
+     * Target of the given entry.
+     */
+    @JsonProperty(value = "target")
+    private String target;
+
+    /**
+     * Get error code of the given entry.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Set error code of the given entry.
+     *
+     * @param code the code value to set
+     * @return the StorageSyncErrorDetails object itself.
+     */
+    public StorageSyncErrorDetails withCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    /**
+     * Get error message of the given entry.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set error message of the given entry.
+     *
+     * @param message the message value to set
+     * @return the StorageSyncErrorDetails object itself.
+     */
+    public StorageSyncErrorDetails withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Get target of the given entry.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set target of the given entry.
+     *
+     * @param target the target value to set
+     * @return the StorageSyncErrorDetails object itself.
+     */
+    public StorageSyncErrorDetails withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorException.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorException.java
new file mode 100644
index 000000000000..d38239dcf199
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncErrorException.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with StorageSyncError information.
+ */
+public class StorageSyncErrorException extends RestException {
+    /**
+     * Initializes a new instance of the StorageSyncErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public StorageSyncErrorException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the StorageSyncErrorException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     * @param body the deserialized response body
+     */
+    public StorageSyncErrorException(final String message, final Response<ResponseBody> response, final StorageSyncError body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public StorageSyncError body() {
+        return (StorageSyncError) super.body();
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceCreateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceCreateParameters.java
new file mode 100644
index 000000000000..4f077389ffd9
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceCreateParameters.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used when creating a storage sync service.
+ */
+public class StorageSyncServiceCreateParameters {
+    /**
+     * Required. Gets or sets the location of the resource. This will be one of
+     * the supported and registered Azure Geo Regions (e.g. West US, East US,
+     * Southeast Asia, etc.). The geo region of a resource cannot be changed
+     * once it is created, but if an identical geo region is specified on
+     * update, the request will succeed.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Gets or sets a list of key value pairs that describe the resource. These
+     * tags can be used for viewing and grouping this resource (across resource
+     * groups). A maximum of 15 tags can be provided for a resource. Each tag
+     * must have a key with a length no greater than 128 characters and a value
+     * with a length no greater than 256 characters.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * Get required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @param location the location value to set
+     * @return the StorageSyncServiceCreateParameters object itself.
+     */
+    public StorageSyncServiceCreateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @param tags the tags value to set
+     * @return the StorageSyncServiceCreateParameters object itself.
+     */
+    public StorageSyncServiceCreateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceUpdateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceUpdateParameters.java
new file mode 100644
index 000000000000..c1cb4403fd3a
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServiceUpdateParameters.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters for updating an Storage sync service.
+ */
+public class StorageSyncServiceUpdateParameters {
+    /**
+     * The user-specified tags associated with the storage sync service.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * The properties of the storage sync service.
+     */
+    @JsonProperty(value = "properties")
+    private Object properties;
+
+    /**
+     * Get the user-specified tags associated with the storage sync service.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the user-specified tags associated with the storage sync service.
+     *
+     * @param tags the tags value to set
+     * @return the StorageSyncServiceUpdateParameters object itself.
+     */
+    public StorageSyncServiceUpdateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the properties of the storage sync service.
+     *
+     * @return the properties value
+     */
+    public Object properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties of the storage sync service.
+     *
+     * @param properties the properties value to set
+     * @return the StorageSyncServiceUpdateParameters object itself.
+     */
+    public StorageSyncServiceUpdateParameters withProperties(Object properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesDeleteHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesDeleteHeaders.java
new file mode 100644
index 000000000000..b8bd59338f7f
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesDeleteHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Delete operation.
+ */
+public class StorageSyncServicesDeleteHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the StorageSyncServicesDeleteHeaders object itself.
+     */
+    public StorageSyncServicesDeleteHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the StorageSyncServicesDeleteHeaders object itself.
+     */
+    public StorageSyncServicesDeleteHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesGetHeaders.java
new file mode 100644
index 000000000000..ab6b9a3a0e62
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class StorageSyncServicesGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the StorageSyncServicesGetHeaders object itself.
+     */
+    public StorageSyncServicesGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the StorageSyncServicesGetHeaders object itself.
+     */
+    public StorageSyncServicesGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListByResourceGroupHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListByResourceGroupHeaders.java
new file mode 100644
index 000000000000..709fcd4f28d7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListByResourceGroupHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListByResourceGroup operation.
+ */
+public class StorageSyncServicesListByResourceGroupHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the StorageSyncServicesListByResourceGroupHeaders object itself.
+     */
+    public StorageSyncServicesListByResourceGroupHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the StorageSyncServicesListByResourceGroupHeaders object itself.
+     */
+    public StorageSyncServicesListByResourceGroupHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListBySubscriptionHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListBySubscriptionHeaders.java
new file mode 100644
index 000000000000..04196dd79a52
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesListBySubscriptionHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListBySubscription operation.
+ */
+public class StorageSyncServicesListBySubscriptionHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the StorageSyncServicesListBySubscriptionHeaders object itself.
+     */
+    public StorageSyncServicesListBySubscriptionHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the StorageSyncServicesListBySubscriptionHeaders object itself.
+     */
+    public StorageSyncServicesListBySubscriptionHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesUpdateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesUpdateHeaders.java
new file mode 100644
index 000000000000..18e17c2cccb7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/StorageSyncServicesUpdateHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Update operation.
+ */
+public class StorageSyncServicesUpdateHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the StorageSyncServicesUpdateHeaders object itself.
+     */
+    public StorageSyncServicesUpdateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the StorageSyncServicesUpdateHeaders object itself.
+     */
+    public StorageSyncServicesUpdateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SubscriptionState.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SubscriptionState.java
new file mode 100644
index 000000000000..a05998fadeff
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SubscriptionState.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Subscription State object.
+ */
+public class SubscriptionState {
+    /**
+     * State of Azure Subscription. Possible values include: 'Registered',
+     * 'Unregistered', 'Warned', 'Suspended', 'Deleted'.
+     */
+    @JsonProperty(value = "state")
+    private Reason state;
+
+    /**
+     * Is Transitioning.
+     */
+    @JsonProperty(value = "istransitioning", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean istransitioning;
+
+    /**
+     * Subscription state properties.
+     */
+    @JsonProperty(value = "properties")
+    private Object properties;
+
+    /**
+     * Get state of Azure Subscription. Possible values include: 'Registered', 'Unregistered', 'Warned', 'Suspended', 'Deleted'.
+     *
+     * @return the state value
+     */
+    public Reason state() {
+        return this.state;
+    }
+
+    /**
+     * Set state of Azure Subscription. Possible values include: 'Registered', 'Unregistered', 'Warned', 'Suspended', 'Deleted'.
+     *
+     * @param state the state value to set
+     * @return the SubscriptionState object itself.
+     */
+    public SubscriptionState withState(Reason state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * Get is Transitioning.
+     *
+     * @return the istransitioning value
+     */
+    public Boolean istransitioning() {
+        return this.istransitioning;
+    }
+
+    /**
+     * Get subscription state properties.
+     *
+     * @return the properties value
+     */
+    public Object properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set subscription state properties.
+     *
+     * @param properties the properties value to set
+     * @return the SubscriptionState object itself.
+     */
+    public SubscriptionState withProperties(Object properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupCreateParameters.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupCreateParameters.java
new file mode 100644
index 000000000000..6fe71452e6af
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupCreateParameters.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters used when creating a sync group.
+ */
+public class SyncGroupCreateParameters {
+    /**
+     * Required. Gets or sets the location of the resource. This will be one of
+     * the supported and registered Azure Geo Regions (e.g. West US, East US,
+     * Southeast Asia, etc.). The geo region of a resource cannot be changed
+     * once it is created, but if an identical geo region is specified on
+     * update, the request will succeed.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * Gets or sets a list of key value pairs that describe the resource. These
+     * tags can be used for viewing and grouping this resource (across resource
+     * groups). A maximum of 15 tags can be provided for a resource. Each tag
+     * must have a key with a length no greater than 128 characters and a value
+     * with a length no greater than 256 characters.
+     */
+    @JsonProperty(value = "tags")
+    private Map<String, String> tags;
+
+    /**
+     * The parameters used to create the sync group.
+     */
+    @JsonProperty(value = "properties")
+    private Object properties;
+
+    /**
+     * Get required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update, the request will succeed.
+     *
+     * @param location the location value to set
+     * @return the SyncGroupCreateParameters object itself.
+     */
+    public SyncGroupCreateParameters withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @return the tags value
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set gets or sets a list of key value pairs that describe the resource. These tags can be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key with a length no greater than 128 characters and a value with a length no greater than 256 characters.
+     *
+     * @param tags the tags value to set
+     * @return the SyncGroupCreateParameters object itself.
+     */
+    public SyncGroupCreateParameters withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the parameters used to create the sync group.
+     *
+     * @return the properties value
+     */
+    public Object properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the parameters used to create the sync group.
+     *
+     * @param properties the properties value to set
+     * @return the SyncGroupCreateParameters object itself.
+     */
+    public SyncGroupCreateParameters withProperties(Object properties) {
+        this.properties = properties;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsCreateHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsCreateHeaders.java
new file mode 100644
index 000000000000..f7e7311ddc7b
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsCreateHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Create operation.
+ */
+public class SyncGroupsCreateHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the SyncGroupsCreateHeaders object itself.
+     */
+    public SyncGroupsCreateHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the SyncGroupsCreateHeaders object itself.
+     */
+    public SyncGroupsCreateHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsDeleteHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsDeleteHeaders.java
new file mode 100644
index 000000000000..19cc4fba2f28
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsDeleteHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Delete operation.
+ */
+public class SyncGroupsDeleteHeaders {
+    /**
+     * Request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the SyncGroupsDeleteHeaders object itself.
+     */
+    public SyncGroupsDeleteHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the SyncGroupsDeleteHeaders object itself.
+     */
+    public SyncGroupsDeleteHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsGetHeaders.java
new file mode 100644
index 000000000000..029c8c2479f6
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class SyncGroupsGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the SyncGroupsGetHeaders object itself.
+     */
+    public SyncGroupsGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the SyncGroupsGetHeaders object itself.
+     */
+    public SyncGroupsGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsListByStorageSyncServiceHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsListByStorageSyncServiceHeaders.java
new file mode 100644
index 000000000000..19723a2e7acd
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/SyncGroupsListByStorageSyncServiceHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for ListByStorageSyncService operation.
+ */
+public class SyncGroupsListByStorageSyncServiceHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the SyncGroupsListByStorageSyncServiceHeaders object itself.
+     */
+    public SyncGroupsListByStorageSyncServiceHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the SyncGroupsListByStorageSyncServiceHeaders object itself.
+     */
+    public SyncGroupsListByStorageSyncServiceHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowArray.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowArray.java
new file mode 100644
index 000000000000..0319087b8b11
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowArray.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import java.util.List;
+import com.microsoft.azure.management.storagesync.implementation.WorkflowInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Array of Workflow.
+ */
+public class WorkflowArray {
+    /**
+     * Collection of workflow items.
+     */
+    @JsonProperty(value = "value")
+    private List<WorkflowInner> value;
+
+    /**
+     * Get collection of workflow items.
+     *
+     * @return the value value
+     */
+    public List<WorkflowInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set collection of workflow items.
+     *
+     * @param value the value value to set
+     * @return the WorkflowArray object itself.
+     */
+    public WorkflowArray withValue(List<WorkflowInner> value) {
+        this.value = value;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsAbortHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsAbortHeaders.java
new file mode 100644
index 000000000000..f73598c2ff47
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsAbortHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Abort operation.
+ */
+public class WorkflowsAbortHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the WorkflowsAbortHeaders object itself.
+     */
+    public WorkflowsAbortHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the WorkflowsAbortHeaders object itself.
+     */
+    public WorkflowsAbortHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsGetHeaders.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsGetHeaders.java
new file mode 100644
index 000000000000..893005a1de97
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/WorkflowsGetHeaders.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Defines headers for Get operation.
+ */
+public class WorkflowsGetHeaders {
+    /**
+     * request id.
+     */
+    @JsonProperty(value = "x-ms-request-id")
+    private String xMsRequestId;
+
+    /**
+     * correlation request id.
+     */
+    @JsonProperty(value = "x-ms-correlation-request-id")
+    private String xMsCorrelationRequestId;
+
+    /**
+     * Get request id.
+     *
+     * @return the xMsRequestId value
+     */
+    public String xMsRequestId() {
+        return this.xMsRequestId;
+    }
+
+    /**
+     * Set request id.
+     *
+     * @param xMsRequestId the xMsRequestId value to set
+     * @return the WorkflowsGetHeaders object itself.
+     */
+    public WorkflowsGetHeaders withXMsRequestId(String xMsRequestId) {
+        this.xMsRequestId = xMsRequestId;
+        return this;
+    }
+
+    /**
+     * Get correlation request id.
+     *
+     * @return the xMsCorrelationRequestId value
+     */
+    public String xMsCorrelationRequestId() {
+        return this.xMsCorrelationRequestId;
+    }
+
+    /**
+     * Set correlation request id.
+     *
+     * @param xMsCorrelationRequestId the xMsCorrelationRequestId value to set
+     * @return the WorkflowsGetHeaders object itself.
+     */
+    public WorkflowsGetHeaders withXMsCorrelationRequestId(String xMsCorrelationRequestId) {
+        this.xMsCorrelationRequestId = xMsCorrelationRequestId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CheckNameAvailabilityResultInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CheckNameAvailabilityResultInner.java
new file mode 100644
index 000000000000..2b7e47e35115
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CheckNameAvailabilityResultInner.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.microsoft.azure.management.storagesync.NameAvailabilityReason;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The CheckNameAvailability operation response.
+ */
+public class CheckNameAvailabilityResultInner {
+    /**
+     * Gets a boolean value that indicates whether the name is available for
+     * you to use. If true, the name is available. If false, the name has
+     * already been taken or invalid and cannot be used.
+     */
+    @JsonProperty(value = "nameAvailable", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean nameAvailable;
+
+    /**
+     * Gets the reason that a Storage Sync Service name could not be used. The
+     * Reason element is only returned if NameAvailable is false. Possible
+     * values include: 'Invalid', 'AlreadyExists'.
+     */
+    @JsonProperty(value = "reason", access = JsonProperty.Access.WRITE_ONLY)
+    private NameAvailabilityReason reason;
+
+    /**
+     * Gets an error message explaining the Reason value in more detail.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * Get gets a boolean value that indicates whether the name is available for you to use. If true, the name is available. If false, the name has already been taken or invalid and cannot be used.
+     *
+     * @return the nameAvailable value
+     */
+    public Boolean nameAvailable() {
+        return this.nameAvailable;
+    }
+
+    /**
+     * Get gets the reason that a Storage Sync Service name could not be used. The Reason element is only returned if NameAvailable is false. Possible values include: 'Invalid', 'AlreadyExists'.
+     *
+     * @return the reason value
+     */
+    public NameAvailabilityReason reason() {
+        return this.reason;
+    }
+
+    /**
+     * Get gets an error message explaining the Reason value in more detail.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointInner.java
new file mode 100644
index 000000000000..dc6c704ced6c
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointInner.java
@@ -0,0 +1,243 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Cloud Endpoint object.
+ */
+@JsonFlatten
+public class CloudEndpointInner extends ProxyResource {
+    /**
+     * Storage Account Resource Id.
+     */
+    @JsonProperty(value = "properties.storageAccountResourceId")
+    private String storageAccountResourceId;
+
+    /**
+     * Storage Account Share name.
+     */
+    @JsonProperty(value = "properties.storageAccountShareName")
+    private String storageAccountShareName;
+
+    /**
+     * Storage Account Tenant Id.
+     */
+    @JsonProperty(value = "properties.storageAccountTenantId")
+    private String storageAccountTenantId;
+
+    /**
+     * Partnership Id.
+     */
+    @JsonProperty(value = "properties.partnershipId")
+    private String partnershipId;
+
+    /**
+     * Friendly Name.
+     */
+    @JsonProperty(value = "properties.friendlyName")
+    private String friendlyName;
+
+    /**
+     * Backup Enabled.
+     */
+    @JsonProperty(value = "properties.backupEnabled", access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean backupEnabled;
+
+    /**
+     * CloudEndpoint Provisioning State.
+     */
+    @JsonProperty(value = "properties.provisioningState")
+    private String provisioningState;
+
+    /**
+     * CloudEndpoint lastWorkflowId.
+     */
+    @JsonProperty(value = "properties.lastWorkflowId")
+    private String lastWorkflowId;
+
+    /**
+     * Resource Last Operation Name.
+     */
+    @JsonProperty(value = "properties.lastOperationName")
+    private String lastOperationName;
+
+    /**
+     * Get storage Account Resource Id.
+     *
+     * @return the storageAccountResourceId value
+     */
+    public String storageAccountResourceId() {
+        return this.storageAccountResourceId;
+    }
+
+    /**
+     * Set storage Account Resource Id.
+     *
+     * @param storageAccountResourceId the storageAccountResourceId value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withStorageAccountResourceId(String storageAccountResourceId) {
+        this.storageAccountResourceId = storageAccountResourceId;
+        return this;
+    }
+
+    /**
+     * Get storage Account Share name.
+     *
+     * @return the storageAccountShareName value
+     */
+    public String storageAccountShareName() {
+        return this.storageAccountShareName;
+    }
+
+    /**
+     * Set storage Account Share name.
+     *
+     * @param storageAccountShareName the storageAccountShareName value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withStorageAccountShareName(String storageAccountShareName) {
+        this.storageAccountShareName = storageAccountShareName;
+        return this;
+    }
+
+    /**
+     * Get storage Account Tenant Id.
+     *
+     * @return the storageAccountTenantId value
+     */
+    public String storageAccountTenantId() {
+        return this.storageAccountTenantId;
+    }
+
+    /**
+     * Set storage Account Tenant Id.
+     *
+     * @param storageAccountTenantId the storageAccountTenantId value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withStorageAccountTenantId(String storageAccountTenantId) {
+        this.storageAccountTenantId = storageAccountTenantId;
+        return this;
+    }
+
+    /**
+     * Get partnership Id.
+     *
+     * @return the partnershipId value
+     */
+    public String partnershipId() {
+        return this.partnershipId;
+    }
+
+    /**
+     * Set partnership Id.
+     *
+     * @param partnershipId the partnershipId value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withPartnershipId(String partnershipId) {
+        this.partnershipId = partnershipId;
+        return this;
+    }
+
+    /**
+     * Get friendly Name.
+     *
+     * @return the friendlyName value
+     */
+    public String friendlyName() {
+        return this.friendlyName;
+    }
+
+    /**
+     * Set friendly Name.
+     *
+     * @param friendlyName the friendlyName value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withFriendlyName(String friendlyName) {
+        this.friendlyName = friendlyName;
+        return this;
+    }
+
+    /**
+     * Get backup Enabled.
+     *
+     * @return the backupEnabled value
+     */
+    public Boolean backupEnabled() {
+        return this.backupEnabled;
+    }
+
+    /**
+     * Get cloudEndpoint Provisioning State.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set cloudEndpoint Provisioning State.
+     *
+     * @param provisioningState the provisioningState value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withProvisioningState(String provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get cloudEndpoint lastWorkflowId.
+     *
+     * @return the lastWorkflowId value
+     */
+    public String lastWorkflowId() {
+        return this.lastWorkflowId;
+    }
+
+    /**
+     * Set cloudEndpoint lastWorkflowId.
+     *
+     * @param lastWorkflowId the lastWorkflowId value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withLastWorkflowId(String lastWorkflowId) {
+        this.lastWorkflowId = lastWorkflowId;
+        return this;
+    }
+
+    /**
+     * Get resource Last Operation Name.
+     *
+     * @return the lastOperationName value
+     */
+    public String lastOperationName() {
+        return this.lastOperationName;
+    }
+
+    /**
+     * Set resource Last Operation Name.
+     *
+     * @param lastOperationName the lastOperationName value to set
+     * @return the CloudEndpointInner object itself.
+     */
+    public CloudEndpointInner withLastOperationName(String lastOperationName) {
+        this.lastOperationName = lastOperationName;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointsInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointsInner.java
new file mode 100644
index 000000000000..8d21184adba8
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/CloudEndpointsInner.java
@@ -0,0 +1,1961 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.storagesync.BackupRequest;
+import com.microsoft.azure.management.storagesync.CloudEndpointCreateParameters;
+import com.microsoft.azure.management.storagesync.CloudEndpointsCreateHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsDeleteHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsGetHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsListBySyncGroupHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsPostBackupHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsPostRestoreHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsPreBackupHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsPreRestoreHeaders;
+import com.microsoft.azure.management.storagesync.CloudEndpointsRestoreheartbeatHeaders;
+import com.microsoft.azure.management.storagesync.PostRestoreRequest;
+import com.microsoft.azure.management.storagesync.PreRestoreRequest;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in CloudEndpoints.
+ */
+public class CloudEndpointsInner {
+    /** The Retrofit service to perform REST calls. */
+    private CloudEndpointsService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of CloudEndpointsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public CloudEndpointsInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(CloudEndpointsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for CloudEndpoints to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface CloudEndpointsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}")
+        Observable<Response<ResponseBody>> create(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body CloudEndpointCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginCreate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}")
+        Observable<Response<ResponseBody>> beginCreate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body CloudEndpointCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints listBySyncGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints")
+        Observable<Response<ResponseBody>> listBySyncGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints preBackup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/prebackup")
+        Observable<Response<ResponseBody>> preBackup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BackupRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginPreBackup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/prebackup")
+        Observable<Response<ResponseBody>> beginPreBackup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BackupRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints postBackup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/postbackup")
+        Observable<Response<ResponseBody>> postBackup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BackupRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginPostBackup" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/postbackup")
+        Observable<Response<ResponseBody>> beginPostBackup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body BackupRequest parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints preRestore" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/prerestore")
+        Observable<Response<ResponseBody>> preRestore(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body PreRestoreRequest parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginPreRestore" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/prerestore")
+        Observable<Response<ResponseBody>> beginPreRestore(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body PreRestoreRequest parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints restoreheartbeat" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/restoreheartbeat")
+        Observable<Response<ResponseBody>> restoreheartbeat(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints postRestore" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/postrestore")
+        Observable<Response<ResponseBody>> postRestore(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body PostRestoreRequest parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.CloudEndpoints beginPostRestore" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/cloudEndpoints/{cloudEndpointName}/postrestore")
+        Observable<Response<ResponseBody>> beginPostRestore(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("cloudEndpointName") String cloudEndpointName, @Query("api-version") String apiVersion, @Body PostRestoreRequest parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the CloudEndpointInner object if successful.
+     */
+    public CloudEndpointInner create(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @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<CloudEndpointInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters, final ServiceCallback<CloudEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<CloudEndpointInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>, CloudEndpointInner>() {
+            @Override
+            public CloudEndpointInner call(ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>> createWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.create(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultWithHeadersAsync(observable, new TypeToken<CloudEndpointInner>() { }.getType(), CloudEndpointsCreateHeaders.class);
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the CloudEndpointInner object if successful.
+     */
+    public CloudEndpointInner beginCreate(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @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<CloudEndpointInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters, final ServiceCallback<CloudEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CloudEndpointInner object
+     */
+    public Observable<CloudEndpointInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>, CloudEndpointInner>() {
+            @Override
+            public CloudEndpointInner call(ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CloudEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>> beginCreateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, CloudEndpointCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreate(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders> clientResponse = beginCreateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsCreateHeaders> beginCreateDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CloudEndpointInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CloudEndpointInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsCreateHeaders.class);
+    }
+
+    /**
+     * Get a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the CloudEndpointInner object if successful.
+     */
+    public CloudEndpointInner get(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<CloudEndpointInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<CloudEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Get a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CloudEndpointInner object
+     */
+    public Observable<CloudEndpointInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders>, CloudEndpointInner>() {
+            @Override
+            public CloudEndpointInner call(ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CloudEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders>> getWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName 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.get(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<CloudEndpointInner, CloudEndpointsGetHeaders> getDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CloudEndpointInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CloudEndpointInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsGetHeaders.class);
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>> deleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName 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.delete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), CloudEndpointsDeleteHeaders.class);
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName 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.beginDelete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, CloudEndpointsDeleteHeaders> beginDeleteDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsDeleteHeaders.class);
+    }
+
+    /**
+     * Get a CloudEndpoint List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;CloudEndpointInner&gt; object if successful.
+     */
+    public List<CloudEndpointInner> listBySyncGroup(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a CloudEndpoint List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @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<List<CloudEndpointInner>> listBySyncGroupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, final ServiceCallback<List<CloudEndpointInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName), serviceCallback);
+    }
+
+    /**
+     * Get a CloudEndpoint List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;CloudEndpointInner&gt; object
+     */
+    public Observable<List<CloudEndpointInner>> listBySyncGroupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).map(new Func1<ServiceResponseWithHeaders<List<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders>, List<CloudEndpointInner>>() {
+            @Override
+            public List<CloudEndpointInner> call(ServiceResponseWithHeaders<List<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a CloudEndpoint List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;CloudEndpointInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders>> listBySyncGroupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName 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.listBySyncGroup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<CloudEndpointInner>> result = listBySyncGroupDelegate(response);
+                        List<CloudEndpointInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<CloudEndpointInner>> clientResponse = new ServiceResponse<List<CloudEndpointInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<CloudEndpointInner>, CloudEndpointsListBySyncGroupHeaders> listBySyncGroupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<CloudEndpointInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<CloudEndpointInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsListBySyncGroupHeaders.class);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void preBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<Void> preBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> preBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> preBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String azureFileShare = null;
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(null);
+        Observable<Response<ResponseBody>> observable = service.preBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), CloudEndpointsPreBackupHeaders.class);
+    }
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void preBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).toBlocking().last().body();
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @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<Void> preBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare), serviceCallback);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> preBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return preBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> preBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(azureFileShare);
+        Observable<Response<ResponseBody>> observable = service.preBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), CloudEndpointsPreBackupHeaders.class);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginPreBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<Void> beginPreBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginPreBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> beginPreBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String azureFileShare = null;
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(null);
+        return service.beginPreBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> clientResponse = beginPreBackupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginPreBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).toBlocking().single().body();
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @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<Void> beginPreBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare), serviceCallback);
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginPreBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return beginPreBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> beginPreBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(azureFileShare);
+        return service.beginPreBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> clientResponse = beginPreBackupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, CloudEndpointsPreBackupHeaders> beginPreBackupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsPreBackupHeaders.class);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PostBackupResponseInner object if successful.
+     */
+    public PostBackupResponseInner postBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<PostBackupResponseInner> postBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<PostBackupResponseInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PostBackupResponseInner> postBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>, PostBackupResponseInner>() {
+            @Override
+            public PostBackupResponseInner call(ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> postBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String azureFileShare = null;
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(null);
+        Observable<Response<ResponseBody>> observable = service.postBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<PostBackupResponseInner>() { }.getType(), CloudEndpointsPostBackupHeaders.class);
+    }
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PostBackupResponseInner object if successful.
+     */
+    public PostBackupResponseInner postBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).toBlocking().last().body();
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @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<PostBackupResponseInner> postBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare, final ServiceCallback<PostBackupResponseInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare), serviceCallback);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<PostBackupResponseInner> postBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return postBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).map(new Func1<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>, PostBackupResponseInner>() {
+            @Override
+            public PostBackupResponseInner call(ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> postBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(azureFileShare);
+        Observable<Response<ResponseBody>> observable = service.postBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<PostBackupResponseInner>() { }.getType(), CloudEndpointsPostBackupHeaders.class);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PostBackupResponseInner object if successful.
+     */
+    public PostBackupResponseInner beginPostBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<PostBackupResponseInner> beginPostBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<PostBackupResponseInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PostBackupResponseInner object
+     */
+    public Observable<PostBackupResponseInner> beginPostBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>, PostBackupResponseInner>() {
+            @Override
+            public PostBackupResponseInner call(ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PostBackupResponseInner object
+     */
+    public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> beginPostBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String azureFileShare = null;
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(null);
+        return service.beginPostBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> clientResponse = beginPostBackupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PostBackupResponseInner object if successful.
+     */
+    public PostBackupResponseInner beginPostBackup(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).toBlocking().single().body();
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @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<PostBackupResponseInner> beginPostBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare, final ServiceCallback<PostBackupResponseInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare), serviceCallback);
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PostBackupResponseInner object
+     */
+    public Observable<PostBackupResponseInner> beginPostBackupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        return beginPostBackupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, azureFileShare).map(new Func1<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>, PostBackupResponseInner>() {
+            @Override
+            public PostBackupResponseInner call(ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Backup a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param azureFileShare Azure File Share.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PostBackupResponseInner object
+     */
+    public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> beginPostBackupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, String azureFileShare) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        BackupRequest parameters = new BackupRequest();
+        parameters.withAzureFileShare(azureFileShare);
+        return service.beginPostBackup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> clientResponse = beginPostBackupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PostBackupResponseInner, CloudEndpointsPostBackupHeaders> beginPostBackupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PostBackupResponseInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PostBackupResponseInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsPostBackupHeaders.class);
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void preRestore(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        preRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @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<Void> preRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(preRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> preRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        return preRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>> preRestoreWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.preRestore(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), CloudEndpointsPreRestoreHeaders.class);
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginPreRestore(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        beginPreRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @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<Void> beginPreRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPreRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginPreRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        return beginPreRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Pre Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>> beginPreRestoreWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PreRestoreRequest parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginPreRestore(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders> clientResponse = beginPreRestoreDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, CloudEndpointsPreRestoreHeaders> beginPreRestoreDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsPreRestoreHeaders.class);
+    }
+
+    /**
+     * Restore Heartbeat a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void restoreheartbeat(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        restoreheartbeatWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Restore Heartbeat a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @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<Void> restoreheartbeatAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(restoreheartbeatWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName), serviceCallback);
+    }
+
+    /**
+     * Restore Heartbeat a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> restoreheartbeatAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        return restoreheartbeatWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Restore Heartbeat a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders>> restoreheartbeatWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName 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.restoreheartbeat(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders> clientResponse = restoreheartbeatDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, CloudEndpointsRestoreheartbeatHeaders> restoreheartbeatDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsRestoreheartbeatHeaders.class);
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void postRestore(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        postRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @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<Void> postRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(postRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> postRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        return postRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>> postRestoreWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.postRestore(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), CloudEndpointsPostRestoreHeaders.class);
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginPostRestore(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        beginPostRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @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<Void> beginPostRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginPostRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginPostRestoreAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        return beginPostRestoreWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Post Restore a given CloudEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param cloudEndpointName Name of Cloud Endpoint object.
+     * @param parameters Body of Cloud Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>> beginPostRestoreWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String cloudEndpointName, PostRestoreRequest parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (cloudEndpointName == null) {
+            throw new IllegalArgumentException("Parameter cloudEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginPostRestore(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, cloudEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders> clientResponse = beginPostRestoreDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, CloudEndpointsPostRestoreHeaders> beginPostRestoreDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, CloudEndpointsPostRestoreHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationEntityInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationEntityInner.java
new file mode 100644
index 000000000000..1fdb824a69dc
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationEntityInner.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.microsoft.azure.management.storagesync.OperationDisplayInfo;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The operation supported by storage sync.
+ */
+public class OperationEntityInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The operation supported by storage sync.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplayInfo display;
+
+    /**
+     * The origin.
+     */
+    @JsonProperty(value = "origin")
+    private String origin;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set operation name: {provider}/{resource}/{operation}.
+     *
+     * @param name the name value to set
+     * @return the OperationEntityInner object itself.
+     */
+    public OperationEntityInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the operation supported by storage sync.
+     *
+     * @return the display value
+     */
+    public OperationDisplayInfo display() {
+        return this.display;
+    }
+
+    /**
+     * Set the operation supported by storage sync.
+     *
+     * @param display the display value to set
+     * @return the OperationEntityInner object itself.
+     */
+    public OperationEntityInner withDisplay(OperationDisplayInfo display) {
+        this.display = display;
+        return this;
+    }
+
+    /**
+     * Get the origin.
+     *
+     * @return the origin value
+     */
+    public String origin() {
+        return this.origin;
+    }
+
+    /**
+     * Set the origin.
+     *
+     * @param origin the origin value to set
+     * @return the OperationEntityInner object itself.
+     */
+    public OperationEntityInner withOrigin(String origin) {
+        this.origin = origin;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationsInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationsInner.java
new file mode 100644
index 000000000000..7c790ee5d929
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/OperationsInner.java
@@ -0,0 +1,284 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.storagesync.OperationsListHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Operations.
+ */
+public class OperationsInner {
+    /** The Retrofit service to perform REST calls. */
+    private OperationsService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OperationsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public OperationsInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(OperationsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Operations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface OperationsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.Operations list" })
+        @GET("providers/Microsoft.StorageSync/operations")
+        Observable<Response<ResponseBody>> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.Operations listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;OperationEntityInner&gt; object if successful.
+     */
+    public PagedList<OperationEntityInner> list() {
+        ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationEntityInner>(response.body()) {
+            @Override
+            public Page<OperationEntityInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @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<List<OperationEntityInner>> listAsync(final ListOperationCallback<OperationEntityInner> serviceCallback) {
+        return AzureServiceFuture.fromHeaderPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationEntityInner&gt; object
+     */
+    public Observable<Page<OperationEntityInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>, Page<OperationEntityInner>>() {
+                @Override
+                public Page<OperationEntityInner> call(ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationEntityInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationEntityInner&gt; object wrapped in {@link ServiceResponseWithHeaders} if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> listSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.list(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<PageImpl<OperationEntityInner>, OperationsListHeaders> result = listDelegate(response);
+                        return Observable.just(new ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>(result.body(), result.headers(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl<OperationEntityInner>, OperationsListHeaders> listDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationEntityInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationEntityInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, OperationsListHeaders.class);
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;OperationEntityInner&gt; object if successful.
+     */
+    public PagedList<OperationEntityInner> listNext(final String nextPageLink) {
+        ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationEntityInner>(response.body()) {
+            @Override
+            public Page<OperationEntityInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<OperationEntityInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<OperationEntityInner>> serviceFuture, final ListOperationCallback<OperationEntityInner> serviceCallback) {
+        return AzureServiceFuture.fromHeaderPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationEntityInner&gt; object
+     */
+    public Observable<Page<OperationEntityInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>, Page<OperationEntityInner>>() {
+                @Override
+                public Page<OperationEntityInner> call(ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationEntityInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Storage Sync Rest API operations.
+     *
+    ServiceResponseWithHeaders<PageImpl<OperationEntityInner>, OperationsListHeaders> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationEntityInner&gt; object wrapped in {@link ServiceResponseWithHeaders} if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<PageImpl<OperationEntityInner>, OperationsListHeaders> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponseWithHeaders<Page<OperationEntityInner>, OperationsListHeaders>(result.body(), result.headers(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl<OperationEntityInner>, OperationsListHeaders> listNextDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<OperationEntityInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationEntityInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, OperationsListHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl.java
new file mode 100644
index 000000000000..8ee8cb9a48d5
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl1.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl1.java
new file mode 100644
index 000000000000..f103ccb999c0
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PageImpl1.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl1<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl1<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl1<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PostBackupResponseInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PostBackupResponseInner.java
new file mode 100644
index 000000000000..1a645167b461
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/PostBackupResponseInner.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+
+/**
+ * Post Backup Response.
+ */
+@JsonFlatten
+public class PostBackupResponseInner {
+    /**
+     * cloud endpoint Name.
+     */
+    @JsonProperty(value = "backupMetadata.cloudEndpointName", access = JsonProperty.Access.WRITE_ONLY)
+    private String cloudEndpointName;
+
+    /**
+     * Get cloud endpoint Name.
+     *
+     * @return the cloudEndpointName value
+     */
+    public String cloudEndpointName() {
+        return this.cloudEndpointName;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServerInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServerInner.java
new file mode 100644
index 000000000000..548017bd64c7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServerInner.java
@@ -0,0 +1,488 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Registered Server resource.
+ */
+@JsonFlatten
+public class RegisteredServerInner extends ProxyResource {
+    /**
+     * Registered Server Certificate.
+     */
+    @JsonProperty(value = "properties.serverCertificate")
+    private String serverCertificate;
+
+    /**
+     * Registered Server Agent Version.
+     */
+    @JsonProperty(value = "properties.agentVersion")
+    private String agentVersion;
+
+    /**
+     * Registered Server OS Version.
+     */
+    @JsonProperty(value = "properties.serverOSVersion")
+    private String serverOSVersion;
+
+    /**
+     * Registered Server Management Error Code.
+     */
+    @JsonProperty(value = "properties.serverManagementtErrorCode")
+    private Integer serverManagementtErrorCode;
+
+    /**
+     * Registered Server last heart beat.
+     */
+    @JsonProperty(value = "properties.lastHeartBeat")
+    private String lastHeartBeat;
+
+    /**
+     * Registered Server Provisioning State.
+     */
+    @JsonProperty(value = "properties.provisioningState")
+    private String provisioningState;
+
+    /**
+     * Registered Server serverRole.
+     */
+    @JsonProperty(value = "properties.serverRole")
+    private String serverRole;
+
+    /**
+     * Registered Server clusterId.
+     */
+    @JsonProperty(value = "properties.clusterId")
+    private String clusterId;
+
+    /**
+     * Registered Server clusterName.
+     */
+    @JsonProperty(value = "properties.clusterName")
+    private String clusterName;
+
+    /**
+     * Registered Server serverId.
+     */
+    @JsonProperty(value = "properties.serverId")
+    private String serverId;
+
+    /**
+     * Registered Server storageSyncServiceUid.
+     */
+    @JsonProperty(value = "properties.storageSyncServiceUid")
+    private String storageSyncServiceUid;
+
+    /**
+     * Registered Server lastWorkflowId.
+     */
+    @JsonProperty(value = "properties.lastWorkflowId")
+    private String lastWorkflowId;
+
+    /**
+     * Resource Last Operation Name.
+     */
+    @JsonProperty(value = "properties.lastOperationName")
+    private String lastOperationName;
+
+    /**
+     * Resource discoveryEndpointUri.
+     */
+    @JsonProperty(value = "properties.discoveryEndpointUri")
+    private String discoveryEndpointUri;
+
+    /**
+     * Resource Location.
+     */
+    @JsonProperty(value = "properties.resourceLocation")
+    private String resourceLocation;
+
+    /**
+     * Service Location.
+     */
+    @JsonProperty(value = "properties.serviceLocation")
+    private String serviceLocation;
+
+    /**
+     * Friendly Name.
+     */
+    @JsonProperty(value = "properties.friendlyName")
+    private String friendlyName;
+
+    /**
+     * Management Endpoint Uri.
+     */
+    @JsonProperty(value = "properties.managementEndpointUri")
+    private String managementEndpointUri;
+
+    /**
+     * Get registered Server Certificate.
+     *
+     * @return the serverCertificate value
+     */
+    public String serverCertificate() {
+        return this.serverCertificate;
+    }
+
+    /**
+     * Set registered Server Certificate.
+     *
+     * @param serverCertificate the serverCertificate value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServerCertificate(String serverCertificate) {
+        this.serverCertificate = serverCertificate;
+        return this;
+    }
+
+    /**
+     * Get registered Server Agent Version.
+     *
+     * @return the agentVersion value
+     */
+    public String agentVersion() {
+        return this.agentVersion;
+    }
+
+    /**
+     * Set registered Server Agent Version.
+     *
+     * @param agentVersion the agentVersion value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withAgentVersion(String agentVersion) {
+        this.agentVersion = agentVersion;
+        return this;
+    }
+
+    /**
+     * Get registered Server OS Version.
+     *
+     * @return the serverOSVersion value
+     */
+    public String serverOSVersion() {
+        return this.serverOSVersion;
+    }
+
+    /**
+     * Set registered Server OS Version.
+     *
+     * @param serverOSVersion the serverOSVersion value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServerOSVersion(String serverOSVersion) {
+        this.serverOSVersion = serverOSVersion;
+        return this;
+    }
+
+    /**
+     * Get registered Server Management Error Code.
+     *
+     * @return the serverManagementtErrorCode value
+     */
+    public Integer serverManagementtErrorCode() {
+        return this.serverManagementtErrorCode;
+    }
+
+    /**
+     * Set registered Server Management Error Code.
+     *
+     * @param serverManagementtErrorCode the serverManagementtErrorCode value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServerManagementtErrorCode(Integer serverManagementtErrorCode) {
+        this.serverManagementtErrorCode = serverManagementtErrorCode;
+        return this;
+    }
+
+    /**
+     * Get registered Server last heart beat.
+     *
+     * @return the lastHeartBeat value
+     */
+    public String lastHeartBeat() {
+        return this.lastHeartBeat;
+    }
+
+    /**
+     * Set registered Server last heart beat.
+     *
+     * @param lastHeartBeat the lastHeartBeat value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withLastHeartBeat(String lastHeartBeat) {
+        this.lastHeartBeat = lastHeartBeat;
+        return this;
+    }
+
+    /**
+     * Get registered Server Provisioning State.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set registered Server Provisioning State.
+     *
+     * @param provisioningState the provisioningState value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withProvisioningState(String provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get registered Server serverRole.
+     *
+     * @return the serverRole value
+     */
+    public String serverRole() {
+        return this.serverRole;
+    }
+
+    /**
+     * Set registered Server serverRole.
+     *
+     * @param serverRole the serverRole value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServerRole(String serverRole) {
+        this.serverRole = serverRole;
+        return this;
+    }
+
+    /**
+     * Get registered Server clusterId.
+     *
+     * @return the clusterId value
+     */
+    public String clusterId() {
+        return this.clusterId;
+    }
+
+    /**
+     * Set registered Server clusterId.
+     *
+     * @param clusterId the clusterId value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withClusterId(String clusterId) {
+        this.clusterId = clusterId;
+        return this;
+    }
+
+    /**
+     * Get registered Server clusterName.
+     *
+     * @return the clusterName value
+     */
+    public String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Set registered Server clusterName.
+     *
+     * @param clusterName the clusterName value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withClusterName(String clusterName) {
+        this.clusterName = clusterName;
+        return this;
+    }
+
+    /**
+     * Get registered Server serverId.
+     *
+     * @return the serverId value
+     */
+    public String serverId() {
+        return this.serverId;
+    }
+
+    /**
+     * Set registered Server serverId.
+     *
+     * @param serverId the serverId value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServerId(String serverId) {
+        this.serverId = serverId;
+        return this;
+    }
+
+    /**
+     * Get registered Server storageSyncServiceUid.
+     *
+     * @return the storageSyncServiceUid value
+     */
+    public String storageSyncServiceUid() {
+        return this.storageSyncServiceUid;
+    }
+
+    /**
+     * Set registered Server storageSyncServiceUid.
+     *
+     * @param storageSyncServiceUid the storageSyncServiceUid value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withStorageSyncServiceUid(String storageSyncServiceUid) {
+        this.storageSyncServiceUid = storageSyncServiceUid;
+        return this;
+    }
+
+    /**
+     * Get registered Server lastWorkflowId.
+     *
+     * @return the lastWorkflowId value
+     */
+    public String lastWorkflowId() {
+        return this.lastWorkflowId;
+    }
+
+    /**
+     * Set registered Server lastWorkflowId.
+     *
+     * @param lastWorkflowId the lastWorkflowId value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withLastWorkflowId(String lastWorkflowId) {
+        this.lastWorkflowId = lastWorkflowId;
+        return this;
+    }
+
+    /**
+     * Get resource Last Operation Name.
+     *
+     * @return the lastOperationName value
+     */
+    public String lastOperationName() {
+        return this.lastOperationName;
+    }
+
+    /**
+     * Set resource Last Operation Name.
+     *
+     * @param lastOperationName the lastOperationName value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withLastOperationName(String lastOperationName) {
+        this.lastOperationName = lastOperationName;
+        return this;
+    }
+
+    /**
+     * Get resource discoveryEndpointUri.
+     *
+     * @return the discoveryEndpointUri value
+     */
+    public String discoveryEndpointUri() {
+        return this.discoveryEndpointUri;
+    }
+
+    /**
+     * Set resource discoveryEndpointUri.
+     *
+     * @param discoveryEndpointUri the discoveryEndpointUri value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withDiscoveryEndpointUri(String discoveryEndpointUri) {
+        this.discoveryEndpointUri = discoveryEndpointUri;
+        return this;
+    }
+
+    /**
+     * Get resource Location.
+     *
+     * @return the resourceLocation value
+     */
+    public String resourceLocation() {
+        return this.resourceLocation;
+    }
+
+    /**
+     * Set resource Location.
+     *
+     * @param resourceLocation the resourceLocation value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withResourceLocation(String resourceLocation) {
+        this.resourceLocation = resourceLocation;
+        return this;
+    }
+
+    /**
+     * Get service Location.
+     *
+     * @return the serviceLocation value
+     */
+    public String serviceLocation() {
+        return this.serviceLocation;
+    }
+
+    /**
+     * Set service Location.
+     *
+     * @param serviceLocation the serviceLocation value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withServiceLocation(String serviceLocation) {
+        this.serviceLocation = serviceLocation;
+        return this;
+    }
+
+    /**
+     * Get friendly Name.
+     *
+     * @return the friendlyName value
+     */
+    public String friendlyName() {
+        return this.friendlyName;
+    }
+
+    /**
+     * Set friendly Name.
+     *
+     * @param friendlyName the friendlyName value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withFriendlyName(String friendlyName) {
+        this.friendlyName = friendlyName;
+        return this;
+    }
+
+    /**
+     * Get management Endpoint Uri.
+     *
+     * @return the managementEndpointUri value
+     */
+    public String managementEndpointUri() {
+        return this.managementEndpointUri;
+    }
+
+    /**
+     * Set management Endpoint Uri.
+     *
+     * @param managementEndpointUri the managementEndpointUri value to set
+     * @return the RegisteredServerInner object itself.
+     */
+    public RegisteredServerInner withManagementEndpointUri(String managementEndpointUri) {
+        this.managementEndpointUri = managementEndpointUri;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServersInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServersInner.java
new file mode 100644
index 000000000000..8f8734316fda
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/RegisteredServersInner.java
@@ -0,0 +1,629 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.storagesync.RegisteredServerCreateParameters;
+import com.microsoft.azure.management.storagesync.RegisteredServersCreateHeaders;
+import com.microsoft.azure.management.storagesync.RegisteredServersDeleteHeaders;
+import com.microsoft.azure.management.storagesync.RegisteredServersGetHeaders;
+import com.microsoft.azure.management.storagesync.RegisteredServersListByStorageSyncServiceHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in RegisteredServers.
+ */
+public class RegisteredServersInner {
+    /** The Retrofit service to perform REST calls. */
+    private RegisteredServersService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of RegisteredServersInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public RegisteredServersInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(RegisteredServersService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for RegisteredServers to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface RegisteredServersService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers listByStorageSyncService" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers")
+        Observable<Response<ResponseBody>> listByStorageSyncService(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers/{serverId}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("serverId") String serverId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers/{serverId}")
+        Observable<Response<ResponseBody>> create(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("serverId") String serverId, @Query("api-version") String apiVersion, @Body RegisteredServerCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers beginCreate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers/{serverId}")
+        Observable<Response<ResponseBody>> beginCreate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("serverId") String serverId, @Query("api-version") String apiVersion, @Body RegisteredServerCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers/{serverId}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("serverId") String serverId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.RegisteredServers beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/registeredServers/{serverId}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("serverId") String serverId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get a given registered server list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;RegisteredServerInner&gt; object if successful.
+     */
+    public List<RegisteredServerInner> listByStorageSyncService(String resourceGroupName, String storageSyncServiceName) {
+        return listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a given registered server list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @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<List<RegisteredServerInner>> listByStorageSyncServiceAsync(String resourceGroupName, String storageSyncServiceName, final ServiceCallback<List<RegisteredServerInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName), serviceCallback);
+    }
+
+    /**
+     * Get a given registered server list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;RegisteredServerInner&gt; object
+     */
+    public Observable<List<RegisteredServerInner>> listByStorageSyncServiceAsync(String resourceGroupName, String storageSyncServiceName) {
+        return listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).map(new Func1<ServiceResponseWithHeaders<List<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders>, List<RegisteredServerInner>>() {
+            @Override
+            public List<RegisteredServerInner> call(ServiceResponseWithHeaders<List<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a given registered server list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;RegisteredServerInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders>> listByStorageSyncServiceWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName 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.listByStorageSyncService(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<RegisteredServerInner>> result = listByStorageSyncServiceDelegate(response);
+                        List<RegisteredServerInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<RegisteredServerInner>> clientResponse = new ServiceResponse<List<RegisteredServerInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<RegisteredServerInner>, RegisteredServersListByStorageSyncServiceHeaders> listByStorageSyncServiceDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<RegisteredServerInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<RegisteredServerInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, RegisteredServersListByStorageSyncServiceHeaders.class);
+    }
+
+    /**
+     * Get a given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RegisteredServerInner object if successful.
+     */
+    public RegisteredServerInner get(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).toBlocking().single().body();
+    }
+
+    /**
+     * Get a given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @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<RegisteredServerInner> getAsync(String resourceGroupName, String storageSyncServiceName, String serverId, final ServiceCallback<RegisteredServerInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId), serviceCallback);
+    }
+
+    /**
+     * Get a given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RegisteredServerInner object
+     */
+    public Observable<RegisteredServerInner> getAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).map(new Func1<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders>, RegisteredServerInner>() {
+            @Override
+            public RegisteredServerInner call(ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RegisteredServerInner object
+     */
+    public Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders>> getWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (serverId == null) {
+            throw new IllegalArgumentException("Parameter serverId 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.get(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersGetHeaders> getDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RegisteredServerInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RegisteredServerInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, RegisteredServersGetHeaders.class);
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RegisteredServerInner object if successful.
+     */
+    public RegisteredServerInner create(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @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<RegisteredServerInner> createAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters, final ServiceCallback<RegisteredServerInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters), serviceCallback);
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<RegisteredServerInner> createAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).map(new Func1<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>, RegisteredServerInner>() {
+            @Override
+            public RegisteredServerInner call(ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>> createWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (serverId == null) {
+            throw new IllegalArgumentException("Parameter serverId is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.create(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultWithHeadersAsync(observable, new TypeToken<RegisteredServerInner>() { }.getType(), RegisteredServersCreateHeaders.class);
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the RegisteredServerInner object if successful.
+     */
+    public RegisteredServerInner beginCreate(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @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<RegisteredServerInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters, final ServiceCallback<RegisteredServerInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters), serviceCallback);
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RegisteredServerInner object
+     */
+    public Observable<RegisteredServerInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).map(new Func1<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>, RegisteredServerInner>() {
+            @Override
+            public RegisteredServerInner call(ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Add a new registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @param parameters Body of Registered Server object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the RegisteredServerInner object
+     */
+    public Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>> beginCreateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, RegisteredServerCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (serverId == null) {
+            throw new IllegalArgumentException("Parameter serverId is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreate(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders> clientResponse = beginCreateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<RegisteredServerInner, RegisteredServersCreateHeaders> beginCreateDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<RegisteredServerInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<RegisteredServerInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, RegisteredServersCreateHeaders.class);
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).toBlocking().last().body();
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @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<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String serverId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId), serviceCallback);
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        return deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>> deleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (serverId == null) {
+            throw new IllegalArgumentException("Parameter serverId 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.delete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), RegisteredServersDeleteHeaders.class);
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).toBlocking().single().body();
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @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<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String serverId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId), serviceCallback);
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete the given registered server.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param serverId GUID identifying the on-premises server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (serverId == null) {
+            throw new IllegalArgumentException("Parameter serverId 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.beginDelete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, RegisteredServersDeleteHeaders> beginDeleteDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, RegisteredServersDeleteHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointInner.java
new file mode 100644
index 000000000000..e17e41d33213
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointInner.java
@@ -0,0 +1,254 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Server Endpoint object.
+ */
+@JsonFlatten
+public class ServerEndpointInner extends ProxyResource {
+    /**
+     * Server Local path.
+     */
+    @JsonProperty(value = "properties.serverLocalPath")
+    private String serverLocalPath;
+
+    /**
+     * Cloud Tiering. Possible values include: 'on', 'off'.
+     */
+    @JsonProperty(value = "properties.cloudTiering")
+    private String cloudTiering;
+
+    /**
+     * Level of free space to be maintained by Cloud Tiering if it is enabled.
+     */
+    @JsonProperty(value = "properties.volumeFreeSpacePercent")
+    private Integer volumeFreeSpacePercent;
+
+    /**
+     * Friendly Name.
+     */
+    @JsonProperty(value = "properties.friendlyName")
+    private String friendlyName;
+
+    /**
+     * Server Resource Id.
+     */
+    @JsonProperty(value = "properties.serverResourceId")
+    private String serverResourceId;
+
+    /**
+     * ServerEndpoint Provisioning State.
+     */
+    @JsonProperty(value = "properties.provisioningState")
+    private String provisioningState;
+
+    /**
+     * ServerEndpoint lastWorkflowId.
+     */
+    @JsonProperty(value = "properties.lastWorkflowId")
+    private String lastWorkflowId;
+
+    /**
+     * Resource Last Operation Name.
+     */
+    @JsonProperty(value = "properties.lastOperationName")
+    private String lastOperationName;
+
+    /**
+     * Sync Health Status.
+     */
+    @JsonProperty(value = "properties.syncStatus")
+    private Object syncStatus;
+
+    /**
+     * Get server Local path.
+     *
+     * @return the serverLocalPath value
+     */
+    public String serverLocalPath() {
+        return this.serverLocalPath;
+    }
+
+    /**
+     * Set server Local path.
+     *
+     * @param serverLocalPath the serverLocalPath value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withServerLocalPath(String serverLocalPath) {
+        this.serverLocalPath = serverLocalPath;
+        return this;
+    }
+
+    /**
+     * Get cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @return the cloudTiering value
+     */
+    public String cloudTiering() {
+        return this.cloudTiering;
+    }
+
+    /**
+     * Set cloud Tiering. Possible values include: 'on', 'off'.
+     *
+     * @param cloudTiering the cloudTiering value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withCloudTiering(String cloudTiering) {
+        this.cloudTiering = cloudTiering;
+        return this;
+    }
+
+    /**
+     * Get level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @return the volumeFreeSpacePercent value
+     */
+    public Integer volumeFreeSpacePercent() {
+        return this.volumeFreeSpacePercent;
+    }
+
+    /**
+     * Set level of free space to be maintained by Cloud Tiering if it is enabled.
+     *
+     * @param volumeFreeSpacePercent the volumeFreeSpacePercent value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withVolumeFreeSpacePercent(Integer volumeFreeSpacePercent) {
+        this.volumeFreeSpacePercent = volumeFreeSpacePercent;
+        return this;
+    }
+
+    /**
+     * Get friendly Name.
+     *
+     * @return the friendlyName value
+     */
+    public String friendlyName() {
+        return this.friendlyName;
+    }
+
+    /**
+     * Set friendly Name.
+     *
+     * @param friendlyName the friendlyName value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withFriendlyName(String friendlyName) {
+        this.friendlyName = friendlyName;
+        return this;
+    }
+
+    /**
+     * Get server Resource Id.
+     *
+     * @return the serverResourceId value
+     */
+    public String serverResourceId() {
+        return this.serverResourceId;
+    }
+
+    /**
+     * Set server Resource Id.
+     *
+     * @param serverResourceId the serverResourceId value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withServerResourceId(String serverResourceId) {
+        this.serverResourceId = serverResourceId;
+        return this;
+    }
+
+    /**
+     * Get serverEndpoint Provisioning State.
+     *
+     * @return the provisioningState value
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set serverEndpoint Provisioning State.
+     *
+     * @param provisioningState the provisioningState value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withProvisioningState(String provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get serverEndpoint lastWorkflowId.
+     *
+     * @return the lastWorkflowId value
+     */
+    public String lastWorkflowId() {
+        return this.lastWorkflowId;
+    }
+
+    /**
+     * Set serverEndpoint lastWorkflowId.
+     *
+     * @param lastWorkflowId the lastWorkflowId value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withLastWorkflowId(String lastWorkflowId) {
+        this.lastWorkflowId = lastWorkflowId;
+        return this;
+    }
+
+    /**
+     * Get resource Last Operation Name.
+     *
+     * @return the lastOperationName value
+     */
+    public String lastOperationName() {
+        return this.lastOperationName;
+    }
+
+    /**
+     * Set resource Last Operation Name.
+     *
+     * @param lastOperationName the lastOperationName value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withLastOperationName(String lastOperationName) {
+        this.lastOperationName = lastOperationName;
+        return this;
+    }
+
+    /**
+     * Get sync Health Status.
+     *
+     * @return the syncStatus value
+     */
+    public Object syncStatus() {
+        return this.syncStatus;
+    }
+
+    /**
+     * Set sync Health Status.
+     *
+     * @param syncStatus the syncStatus value to set
+     * @return the ServerEndpointInner object itself.
+     */
+    public ServerEndpointInner withSyncStatus(Object syncStatus) {
+        this.syncStatus = syncStatus;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointsInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointsInner.java
new file mode 100644
index 000000000000..f9e9e3592175
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/ServerEndpointsInner.java
@@ -0,0 +1,1261 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.storagesync.RecallActionParameters;
+import com.microsoft.azure.management.storagesync.ServerEndpointCreateParameters;
+import com.microsoft.azure.management.storagesync.ServerEndpointsCreateHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointsDeleteHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointsGetHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointsListBySyncGroupHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointsRecallActionHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointsUpdateHeaders;
+import com.microsoft.azure.management.storagesync.ServerEndpointUpdateParameters;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ServerEndpoints.
+ */
+public class ServerEndpointsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ServerEndpointsService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ServerEndpointsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ServerEndpointsInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(ServerEndpointsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ServerEndpoints to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ServerEndpointsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}")
+        Observable<Response<ResponseBody>> create(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body ServerEndpointCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints beginCreate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}")
+        Observable<Response<ResponseBody>> beginCreate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body ServerEndpointCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}")
+        Observable<Response<ResponseBody>> update(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body ServerEndpointUpdateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints beginUpdate" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}")
+        Observable<Response<ResponseBody>> beginUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body ServerEndpointUpdateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints listBySyncGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints")
+        Observable<Response<ResponseBody>> listBySyncGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints recallAction" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}/recallAction")
+        Observable<Response<ResponseBody>> recallAction(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body RecallActionParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.ServerEndpoints beginRecallAction" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}/serverEndpoints/{serverEndpointName}/recallAction")
+        Observable<Response<ResponseBody>> beginRecallAction(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Path("serverEndpointName") String serverEndpointName, @Query("api-version") String apiVersion, @Body RecallActionParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner create(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @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<ServerEndpointInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServerEndpointInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>> createWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.create(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultWithHeadersAsync(observable, new TypeToken<ServerEndpointInner>() { }.getType(), ServerEndpointsCreateHeaders.class);
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner beginCreate(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @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<ServerEndpointInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServerEndpointInner> beginCreateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        return beginCreateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>> beginCreateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreate(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders> clientResponse = beginCreateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsCreateHeaders> beginCreateDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServerEndpointInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServerEndpointInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsCreateHeaders.class);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner update(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @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<ServerEndpointInner> updateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName), serviceCallback);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServerEndpointInner> updateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> updateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final ServerEndpointUpdateParameters parameters = null;
+        Observable<Response<ResponseBody>> observable = service.update(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultWithHeadersAsync(observable, new TypeToken<ServerEndpointInner>() { }.getType(), ServerEndpointsUpdateHeaders.class);
+    }
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner update(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @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<ServerEndpointInner> updateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServerEndpointInner> updateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> updateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.update(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultWithHeadersAsync(observable, new TypeToken<ServerEndpointInner>() { }.getType(), ServerEndpointsUpdateHeaders.class);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner beginUpdate(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @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<ServerEndpointInner> beginUpdateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName), serviceCallback);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServerEndpointInner> beginUpdateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> beginUpdateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final ServerEndpointUpdateParameters parameters = null;
+        return service.beginUpdate(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> clientResponse = beginUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner beginUpdate(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @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<ServerEndpointInner> beginUpdateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServerEndpointInner> beginUpdateAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        return beginUpdateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Any of the properties applicable in PUT request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> beginUpdateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, ServerEndpointUpdateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginUpdate(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> clientResponse = beginUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsUpdateHeaders> beginUpdateDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServerEndpointInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServerEndpointInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsUpdateHeaders.class);
+    }
+
+    /**
+     * Get a ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the ServerEndpointInner object if successful.
+     */
+    public ServerEndpointInner get(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @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<ServerEndpointInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, final ServiceCallback<ServerEndpointInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName), serviceCallback);
+    }
+
+    /**
+     * Get a ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServerEndpointInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).map(new Func1<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders>, ServerEndpointInner>() {
+            @Override
+            public ServerEndpointInner call(ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ServerEndpointInner object
+     */
+    public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders>> getWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName 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.get(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<ServerEndpointInner, ServerEndpointsGetHeaders> getDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ServerEndpointInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ServerEndpointInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsGetHeaders.class);
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).toBlocking().last().body();
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @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<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName), serviceCallback);
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>> deleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName 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.delete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), ServerEndpointsDeleteHeaders.class);
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginDelete(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @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<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName), serviceCallback);
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName).map(new Func1<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given ServerEndpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName 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.beginDelete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, ServerEndpointsDeleteHeaders> beginDeleteDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsDeleteHeaders.class);
+    }
+
+    /**
+     * Get a ServerEndpoint list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;ServerEndpointInner&gt; object if successful.
+     */
+    public List<ServerEndpointInner> listBySyncGroup(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a ServerEndpoint list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @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<List<ServerEndpointInner>> listBySyncGroupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, final ServiceCallback<List<ServerEndpointInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName), serviceCallback);
+    }
+
+    /**
+     * Get a ServerEndpoint list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;ServerEndpointInner&gt; object
+     */
+    public Observable<List<ServerEndpointInner>> listBySyncGroupAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return listBySyncGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).map(new Func1<ServiceResponseWithHeaders<List<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders>, List<ServerEndpointInner>>() {
+            @Override
+            public List<ServerEndpointInner> call(ServiceResponseWithHeaders<List<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a ServerEndpoint list.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;ServerEndpointInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders>> listBySyncGroupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName 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.listBySyncGroup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<ServerEndpointInner>> result = listBySyncGroupDelegate(response);
+                        List<ServerEndpointInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<ServerEndpointInner>> clientResponse = new ServiceResponse<List<ServerEndpointInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<ServerEndpointInner>, ServerEndpointsListBySyncGroupHeaders> listBySyncGroupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<ServerEndpointInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<ServerEndpointInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsListBySyncGroupHeaders.class);
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void recallAction(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        recallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @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<Void> recallActionAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(recallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> recallActionAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        return recallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>> recallActionWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.recallAction(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), ServerEndpointsRecallActionHeaders.class);
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void beginRecallAction(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        beginRecallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @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<Void> beginRecallActionAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(beginRecallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters), serviceCallback);
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> beginRecallActionAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        return beginRecallActionWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, parameters).map(new Func1<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Recall a serverendpoint.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param serverEndpointName Name of Server Endpoint object.
+     * @param parameters Body of Recall Action object.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>> beginRecallActionWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, String serverEndpointName, RecallActionParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (serverEndpointName == null) {
+            throw new IllegalArgumentException("Parameter serverEndpointName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginRecallAction(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, serverEndpointName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders> clientResponse = beginRecallActionDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, ServerEndpointsRecallActionHeaders> beginRecallActionDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, ServerEndpointsRecallActionHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncManagementClientImpl.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncManagementClientImpl.java
new file mode 100644
index 000000000000..173b6fc45771
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncManagementClientImpl.java
@@ -0,0 +1,280 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the StorageSyncManagementClientImpl class.
+ */
+public class StorageSyncManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** The API version to use for this operation. */
+    private String apiVersion;
+
+    /**
+     * Gets The API version to use for this operation.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** The ID of the target subscription. */
+    private String subscriptionId;
+
+    /**
+     * Gets The ID of the target subscription.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets The ID of the target subscription.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public StorageSyncManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public StorageSyncManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public StorageSyncManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public StorageSyncManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The StorageSyncServicesInner object to access its operations.
+     */
+    private StorageSyncServicesInner storageSyncServices;
+
+    /**
+     * Gets the StorageSyncServicesInner object to access its operations.
+     * @return the StorageSyncServicesInner object.
+     */
+    public StorageSyncServicesInner storageSyncServices() {
+        return this.storageSyncServices;
+    }
+
+    /**
+     * The SyncGroupsInner object to access its operations.
+     */
+    private SyncGroupsInner syncGroups;
+
+    /**
+     * Gets the SyncGroupsInner object to access its operations.
+     * @return the SyncGroupsInner object.
+     */
+    public SyncGroupsInner syncGroups() {
+        return this.syncGroups;
+    }
+
+    /**
+     * The CloudEndpointsInner object to access its operations.
+     */
+    private CloudEndpointsInner cloudEndpoints;
+
+    /**
+     * Gets the CloudEndpointsInner object to access its operations.
+     * @return the CloudEndpointsInner object.
+     */
+    public CloudEndpointsInner cloudEndpoints() {
+        return this.cloudEndpoints;
+    }
+
+    /**
+     * The ServerEndpointsInner object to access its operations.
+     */
+    private ServerEndpointsInner serverEndpoints;
+
+    /**
+     * Gets the ServerEndpointsInner object to access its operations.
+     * @return the ServerEndpointsInner object.
+     */
+    public ServerEndpointsInner serverEndpoints() {
+        return this.serverEndpoints;
+    }
+
+    /**
+     * The RegisteredServersInner object to access its operations.
+     */
+    private RegisteredServersInner registeredServers;
+
+    /**
+     * Gets the RegisteredServersInner object to access its operations.
+     * @return the RegisteredServersInner object.
+     */
+    public RegisteredServersInner registeredServers() {
+        return this.registeredServers;
+    }
+
+    /**
+     * The WorkflowsInner object to access its operations.
+     */
+    private WorkflowsInner workflows;
+
+    /**
+     * Gets the WorkflowsInner object to access its operations.
+     * @return the WorkflowsInner object.
+     */
+    public WorkflowsInner workflows() {
+        return this.workflows;
+    }
+
+    /**
+     * Initializes an instance of StorageSyncManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public StorageSyncManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://azure.microsoft.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of StorageSyncManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public StorageSyncManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of StorageSyncManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public StorageSyncManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2018-04-02";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.storageSyncServices = new StorageSyncServicesInner(restClient().retrofit(), this);
+        this.syncGroups = new SyncGroupsInner(restClient().retrofit(), this);
+        this.cloudEndpoints = new CloudEndpointsInner(restClient().retrofit(), this);
+        this.serverEndpoints = new ServerEndpointsInner(restClient().retrofit(), this);
+        this.registeredServers = new RegisteredServersInner(restClient().retrofit(), this);
+        this.workflows = new WorkflowsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "StorageSyncManagementClient", "2018-04-02");
+    }
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServiceInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServiceInner.java
new file mode 100644
index 000000000000..a5d6853002f2
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServiceInner.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.Resource;
+
+/**
+ * Storage Sync Service object.
+ */
+@JsonFlatten
+public class StorageSyncServiceInner extends Resource {
+    /**
+     * Storage Sync service status.
+     */
+    @JsonProperty(value = "properties.storageSyncServiceStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private Integer storageSyncServiceStatus;
+
+    /**
+     * Storage Sync service Uid.
+     */
+    @JsonProperty(value = "properties.storageSyncServiceUid", access = JsonProperty.Access.WRITE_ONLY)
+    private String storageSyncServiceUid;
+
+    /**
+     * Get storage Sync service status.
+     *
+     * @return the storageSyncServiceStatus value
+     */
+    public Integer storageSyncServiceStatus() {
+        return this.storageSyncServiceStatus;
+    }
+
+    /**
+     * Get storage Sync service Uid.
+     *
+     * @return the storageSyncServiceUid value
+     */
+    public String storageSyncServiceUid() {
+        return this.storageSyncServiceUid;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServicesInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServicesInner.java
new file mode 100644
index 000000000000..ded0f0081b6e
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/StorageSyncServicesInner.java
@@ -0,0 +1,800 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsGet;
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.storagesync.CheckNameAvailabilityParameters;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.azure.management.storagesync.StorageSyncServiceCreateParameters;
+import com.microsoft.azure.management.storagesync.StorageSyncServicesDeleteHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncServicesGetHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncServicesListByResourceGroupHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncServicesListBySubscriptionHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncServicesUpdateHeaders;
+import com.microsoft.azure.management.storagesync.StorageSyncServiceUpdateParameters;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.PATCH;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in StorageSyncServices.
+ */
+public class StorageSyncServicesInner implements InnerSupportsGet<StorageSyncServiceInner>, InnerSupportsDelete<Void>, InnerSupportsListing<StorageSyncServiceInner> {
+    /** The Retrofit service to perform REST calls. */
+    private StorageSyncServicesService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of StorageSyncServicesInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public StorageSyncServicesInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(StorageSyncServicesService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for StorageSyncServices to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface StorageSyncServicesService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices checkNameAvailability" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.StorageSync/locations/{locationName}/checkNameAvailability")
+        Observable<Response<ResponseBody>> checkNameAvailability(@Path("locationName") String locationName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body CheckNameAvailabilityParameters parameters, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}")
+        Observable<Response<ResponseBody>> create(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Body StorageSyncServiceCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices getByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}")
+        Observable<Response<ResponseBody>> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices update" })
+        @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}")
+        Observable<Response<ResponseBody>> update(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Body StorageSyncServiceUpdateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.StorageSyncServices list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.StorageSync/storageSyncServices")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Check the give namespace name availability.
+     *
+     * @param locationName The desired region for the name check.
+     * @param name The name to check for availability
+     * @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 CheckNameAvailabilityResultInner object if successful.
+     */
+    public CheckNameAvailabilityResultInner checkNameAvailability(String locationName, String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(locationName, name).toBlocking().single().body();
+    }
+
+    /**
+     * Check the give namespace name availability.
+     *
+     * @param locationName The desired region for the name check.
+     * @param name The name to check for availability
+     * @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<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String locationName, String name, final ServiceCallback<CheckNameAvailabilityResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(checkNameAvailabilityWithServiceResponseAsync(locationName, name), serviceCallback);
+    }
+
+    /**
+     * Check the give namespace name availability.
+     *
+     * @param locationName The desired region for the name check.
+     * @param name The name to check for availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<CheckNameAvailabilityResultInner> checkNameAvailabilityAsync(String locationName, String name) {
+        return checkNameAvailabilityWithServiceResponseAsync(locationName, name).map(new Func1<ServiceResponse<CheckNameAvailabilityResultInner>, CheckNameAvailabilityResultInner>() {
+            @Override
+            public CheckNameAvailabilityResultInner call(ServiceResponse<CheckNameAvailabilityResultInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Check the give namespace name availability.
+     *
+     * @param locationName The desired region for the name check.
+     * @param name The name to check for availability
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the CheckNameAvailabilityResultInner object
+     */
+    public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> checkNameAvailabilityWithServiceResponseAsync(String locationName, String name) {
+        if (locationName == null) {
+            throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Parameter name is required and cannot be null.");
+        }
+        CheckNameAvailabilityParameters parameters = new CheckNameAvailabilityParameters();
+        parameters.withName(name);
+        return service.checkNameAvailability(locationName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<CheckNameAvailabilityResultInner>>>() {
+                @Override
+                public Observable<ServiceResponse<CheckNameAvailabilityResultInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<CheckNameAvailabilityResultInner> clientResponse = checkNameAvailabilityDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<CheckNameAvailabilityResultInner> checkNameAvailabilityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<CheckNameAvailabilityResultInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<CheckNameAvailabilityResultInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Create a new StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the StorageSyncServiceInner object if successful.
+     */
+    public StorageSyncServiceInner create(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create a new StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource name.
+     * @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<StorageSyncServiceInner> createAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceCreateParameters parameters, final ServiceCallback<StorageSyncServiceInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<StorageSyncServiceInner> createAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters).map(new Func1<ServiceResponse<StorageSyncServiceInner>, StorageSyncServiceInner>() {
+            @Override
+            public StorageSyncServiceInner call(ServiceResponse<StorageSyncServiceInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<ServiceResponse<StorageSyncServiceInner>> createWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.create(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<StorageSyncServiceInner>>>() {
+                @Override
+                public Observable<ServiceResponse<StorageSyncServiceInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<StorageSyncServiceInner> clientResponse = createDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<StorageSyncServiceInner> createDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<StorageSyncServiceInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<StorageSyncServiceInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the StorageSyncServiceInner object if successful.
+     */
+    public StorageSyncServiceInner getByResourceGroup(String resourceGroupName, String storageSyncServiceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @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<StorageSyncServiceInner> getByResourceGroupAsync(String resourceGroupName, String storageSyncServiceName, final ServiceCallback<StorageSyncServiceInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName), serviceCallback);
+    }
+
+    /**
+     * Get a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<StorageSyncServiceInner> getByResourceGroupAsync(String resourceGroupName, String storageSyncServiceName) {
+        return getByResourceGroupWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).map(new Func1<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders>, StorageSyncServiceInner>() {
+            @Override
+            public StorageSyncServiceInner call(ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders>> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName 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.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders> clientResponse = getByResourceGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesGetHeaders> getByResourceGroupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<StorageSyncServiceInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<StorageSyncServiceInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, StorageSyncServicesGetHeaders.class);
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the StorageSyncServiceInner object if successful.
+     */
+    public StorageSyncServiceInner update(String resourceGroupName, String storageSyncServiceName) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @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<StorageSyncServiceInner> updateAsync(String resourceGroupName, String storageSyncServiceName, final ServiceCallback<StorageSyncServiceInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName), serviceCallback);
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<StorageSyncServiceInner> updateAsync(String resourceGroupName, String storageSyncServiceName) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).map(new Func1<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>, StorageSyncServiceInner>() {
+            @Override
+            public StorageSyncServiceInner call(ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>> updateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final StorageSyncServiceUpdateParameters parameters = null;
+        return service.update(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the StorageSyncServiceInner object if successful.
+     */
+    public StorageSyncServiceInner update(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceUpdateParameters parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource.
+     * @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<StorageSyncServiceInner> updateAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceUpdateParameters parameters, final ServiceCallback<StorageSyncServiceInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<StorageSyncServiceInner> updateAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceUpdateParameters parameters) {
+        return updateWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, parameters).map(new Func1<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>, StorageSyncServiceInner>() {
+            @Override
+            public StorageSyncServiceInner call(ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Patch a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param parameters Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the StorageSyncServiceInner object
+     */
+    public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>> updateWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, StorageSyncServiceUpdateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.update(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders> clientResponse = updateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<StorageSyncServiceInner, StorageSyncServicesUpdateHeaders> updateDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<StorageSyncServiceInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<StorageSyncServiceInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, StorageSyncServicesUpdateHeaders.class);
+    }
+
+    /**
+     * Delete a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String storageSyncServiceName) {
+        deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @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<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName), serviceCallback);
+    }
+
+    /**
+     * Delete a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).map(new Func1<ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given StorageSyncService.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders>> deleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName 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.delete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, StorageSyncServicesDeleteHeaders> deleteDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, StorageSyncServicesDeleteHeaders.class);
+    }
+
+    /**
+     * Get a StorageSyncService list by Resource group name.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @return the PagedList<StorageSyncServiceInner> object if successful.
+     */
+    public PagedList<StorageSyncServiceInner> listByResourceGroup(String resourceGroupName) {
+        PageImpl1<StorageSyncServiceInner> page = new PageImpl1<>();
+        page.setItems(listByResourceGroupWithServiceResponseAsync(resourceGroupName).toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<StorageSyncServiceInner>(page) {
+            @Override
+            public Page<StorageSyncServiceInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Get a StorageSyncService list by Resource group name.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<StorageSyncServiceInner>> listByResourceGroupAsync(String resourceGroupName, final ServiceCallback<List<StorageSyncServiceInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listByResourceGroupWithServiceResponseAsync(resourceGroupName), serviceCallback);
+    }
+
+    /**
+     * Get a StorageSyncService list by Resource group name.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @return the observable to the List&lt;StorageSyncServiceInner&gt; object
+     */
+    public Observable<Page<StorageSyncServiceInner>> listByResourceGroupAsync(String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName).map(new Func1<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders>, Page<StorageSyncServiceInner>>() {
+            @Override
+            public Page<StorageSyncServiceInner> call(ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders> response) {
+                PageImpl1<StorageSyncServiceInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Get a StorageSyncService list by Resource group name.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @return the observable to the List&lt;StorageSyncServiceInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders>> listByResourceGroupWithServiceResponseAsync(String resourceGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName 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.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<StorageSyncServiceInner>> result = listByResourceGroupDelegate(response);
+                        List<StorageSyncServiceInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<StorageSyncServiceInner>> clientResponse = new ServiceResponse<List<StorageSyncServiceInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<StorageSyncServiceInner>, StorageSyncServicesListByResourceGroupHeaders> listByResourceGroupDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<StorageSyncServiceInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<StorageSyncServiceInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, StorageSyncServicesListByResourceGroupHeaders.class);
+    }
+
+    /**
+     * Get a StorageSyncService list by subscription.
+     *
+     * @return the PagedList<StorageSyncServiceInner> object if successful.
+     */
+    public PagedList<StorageSyncServiceInner> list() {
+        PageImpl1<StorageSyncServiceInner> page = new PageImpl1<>();
+        page.setItems(listWithServiceResponseAsync().toBlocking().single().body());
+        page.setNextPageLink(null);
+        return new PagedList<StorageSyncServiceInner>(page) {
+            @Override
+            public Page<StorageSyncServiceInner> nextPage(String nextPageLink) {
+                return null;
+            }
+        };
+    }
+
+    /**
+     * Get a StorageSyncService list by subscription.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<StorageSyncServiceInner>> listAsync(final ServiceCallback<List<StorageSyncServiceInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listWithServiceResponseAsync(), serviceCallback);
+    }
+
+    /**
+     * Get a StorageSyncService list by subscription.
+     *
+     * @return the observable to the List&lt;StorageSyncServiceInner&gt; object
+     */
+    public Observable<Page<StorageSyncServiceInner>> listAsync() {
+        return listWithServiceResponseAsync().map(new Func1<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders>, Page<StorageSyncServiceInner>>() {
+            @Override
+            public Page<StorageSyncServiceInner> call(ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders> response) {
+                PageImpl1<StorageSyncServiceInner> page = new PageImpl1<>();
+                page.setItems(response.body());
+                return page;
+            }
+        });
+    }
+
+    /**
+     * Get a StorageSyncService list by subscription.
+     *
+     * @return the observable to the List&lt;StorageSyncServiceInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders>> listWithServiceResponseAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<StorageSyncServiceInner>> result = listDelegate(response);
+                        List<StorageSyncServiceInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<StorageSyncServiceInner>> clientResponse = new ServiceResponse<List<StorageSyncServiceInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<StorageSyncServiceInner>, StorageSyncServicesListBySubscriptionHeaders> listDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<StorageSyncServiceInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<StorageSyncServiceInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, StorageSyncServicesListBySubscriptionHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupInner.java
new file mode 100644
index 000000000000..87e5cc553dc7
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupInner.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Sync Group object.
+ */
+@JsonFlatten
+public class SyncGroupInner extends ProxyResource {
+    /**
+     * Unique Id.
+     */
+    @JsonProperty(value = "properties.uniqueId")
+    private String uniqueId;
+
+    /**
+     * Sync group status.
+     */
+    @JsonProperty(value = "properties.syncGroupStatus", access = JsonProperty.Access.WRITE_ONLY)
+    private String syncGroupStatus;
+
+    /**
+     * Get unique Id.
+     *
+     * @return the uniqueId value
+     */
+    public String uniqueId() {
+        return this.uniqueId;
+    }
+
+    /**
+     * Set unique Id.
+     *
+     * @param uniqueId the uniqueId value to set
+     * @return the SyncGroupInner object itself.
+     */
+    public SyncGroupInner withUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+        return this;
+    }
+
+    /**
+     * Get sync group status.
+     *
+     * @return the syncGroupStatus value
+     */
+    public String syncGroupStatus() {
+        return this.syncGroupStatus;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupsInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupsInner.java
new file mode 100644
index 000000000000..c77a3c3d9d27
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/SyncGroupsInner.java
@@ -0,0 +1,460 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.azure.management.storagesync.SyncGroupCreateParameters;
+import com.microsoft.azure.management.storagesync.SyncGroupsCreateHeaders;
+import com.microsoft.azure.management.storagesync.SyncGroupsDeleteHeaders;
+import com.microsoft.azure.management.storagesync.SyncGroupsGetHeaders;
+import com.microsoft.azure.management.storagesync.SyncGroupsListByStorageSyncServiceHeaders;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in SyncGroups.
+ */
+public class SyncGroupsInner {
+    /** The Retrofit service to perform REST calls. */
+    private SyncGroupsService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of SyncGroupsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public SyncGroupsInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(SyncGroupsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for SyncGroups to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface SyncGroupsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.SyncGroups listByStorageSyncService" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups")
+        Observable<Response<ResponseBody>> listByStorageSyncService(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.SyncGroups create" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}")
+        Observable<Response<ResponseBody>> create(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Query("api-version") String apiVersion, @Body SyncGroupCreateParameters parameters, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.SyncGroups get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.SyncGroups delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/syncGroups/{syncGroupName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("syncGroupName") String syncGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get a SyncGroup List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the List&lt;SyncGroupInner&gt; object if successful.
+     */
+    public List<SyncGroupInner> listByStorageSyncService(String resourceGroupName, String storageSyncServiceName) {
+        return listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a SyncGroup List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @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<List<SyncGroupInner>> listByStorageSyncServiceAsync(String resourceGroupName, String storageSyncServiceName, final ServiceCallback<List<SyncGroupInner>> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName), serviceCallback);
+    }
+
+    /**
+     * Get a SyncGroup List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;SyncGroupInner&gt; object
+     */
+    public Observable<List<SyncGroupInner>> listByStorageSyncServiceAsync(String resourceGroupName, String storageSyncServiceName) {
+        return listByStorageSyncServiceWithServiceResponseAsync(resourceGroupName, storageSyncServiceName).map(new Func1<ServiceResponseWithHeaders<List<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders>, List<SyncGroupInner>>() {
+            @Override
+            public List<SyncGroupInner> call(ServiceResponseWithHeaders<List<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a SyncGroup List.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the List&lt;SyncGroupInner&gt; object
+     */
+    public Observable<ServiceResponseWithHeaders<List<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders>> listByStorageSyncServiceWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName 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.listByStorageSyncService(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<List<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<List<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<SyncGroupInner>> result = listByStorageSyncServiceDelegate(response);
+                        List<SyncGroupInner> items = null;
+                        if (result.body() != null) {
+                            items = result.body().items();
+                        }
+                        ServiceResponse<List<SyncGroupInner>> clientResponse = new ServiceResponse<List<SyncGroupInner>>(items, result.response());
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<PageImpl1<SyncGroupInner>, SyncGroupsListByStorageSyncServiceHeaders> listByStorageSyncServiceDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<SyncGroupInner>, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<SyncGroupInner>>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, SyncGroupsListByStorageSyncServiceHeaders.class);
+    }
+
+    /**
+     * Create a new SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param parameters Sync Group Body
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SyncGroupInner object if successful.
+     */
+    public SyncGroupInner create(String resourceGroupName, String storageSyncServiceName, String syncGroupName, SyncGroupCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Create a new SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param parameters Sync Group Body
+     * @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<SyncGroupInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, SyncGroupCreateParameters parameters, final ServiceCallback<SyncGroupInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, parameters), serviceCallback);
+    }
+
+    /**
+     * Create a new SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param parameters Sync Group Body
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SyncGroupInner object
+     */
+    public Observable<SyncGroupInner> createAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, SyncGroupCreateParameters parameters) {
+        return createWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName, parameters).map(new Func1<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders>, SyncGroupInner>() {
+            @Override
+            public SyncGroupInner call(ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Create a new SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @param parameters Sync Group Body
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SyncGroupInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders>> createWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, SyncGroupCreateParameters parameters) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.create(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders> clientResponse = createDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsCreateHeaders> createDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SyncGroupInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SyncGroupInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, SyncGroupsCreateHeaders.class);
+    }
+
+    /**
+     * Get a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SyncGroupInner object if successful.
+     */
+    public SyncGroupInner get(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Get a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @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<SyncGroupInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, final ServiceCallback<SyncGroupInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName), serviceCallback);
+    }
+
+    /**
+     * Get a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SyncGroupInner object
+     */
+    public Observable<SyncGroupInner> getAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).map(new Func1<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders>, SyncGroupInner>() {
+            @Override
+            public SyncGroupInner call(ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SyncGroupInner object
+     */
+    public Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders>> getWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName 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.get(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<SyncGroupInner, SyncGroupsGetHeaders> getDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SyncGroupInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SyncGroupInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, SyncGroupsGetHeaders.class);
+    }
+
+    /**
+     * Delete a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).toBlocking().single().body();
+    }
+
+    /**
+     * Delete a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @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<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName), serviceCallback);
+    }
+
+    /**
+     * Delete a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, syncGroupName).map(new Func1<ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Delete a given SyncGroup.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param syncGroupName Name of Sync Group resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders>> deleteWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String syncGroupName) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (syncGroupName == null) {
+            throw new IllegalArgumentException("Parameter syncGroupName 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.delete(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, syncGroupName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, SyncGroupsDeleteHeaders> deleteDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, SyncGroupsDeleteHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowInner.java
new file mode 100644
index 000000000000..f63d37d465bd
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowInner.java
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * Workflow resource.
+ */
+@JsonFlatten
+public class WorkflowInner extends ProxyResource {
+    /**
+     * last step name.
+     */
+    @JsonProperty(value = "properties.lastStepName")
+    private String lastStepName;
+
+    /**
+     * workflow status. Possible values include: 'active', 'expired',
+     * 'succeeded', 'aborted', 'failed'.
+     */
+    @JsonProperty(value = "properties.status")
+    private String status;
+
+    /**
+     * operation direction. Possible values include: 'do', 'undo', 'cancel'.
+     */
+    @JsonProperty(value = "properties.operation")
+    private String operation;
+
+    /**
+     * workflow steps.
+     */
+    @JsonProperty(value = "properties.steps")
+    private String steps;
+
+    /**
+     * workflow last operation identifier.
+     */
+    @JsonProperty(value = "properties.lastOperationId")
+    private String lastOperationId;
+
+    /**
+     * Get last step name.
+     *
+     * @return the lastStepName value
+     */
+    public String lastStepName() {
+        return this.lastStepName;
+    }
+
+    /**
+     * Set last step name.
+     *
+     * @param lastStepName the lastStepName value to set
+     * @return the WorkflowInner object itself.
+     */
+    public WorkflowInner withLastStepName(String lastStepName) {
+        this.lastStepName = lastStepName;
+        return this;
+    }
+
+    /**
+     * Get workflow status. Possible values include: 'active', 'expired', 'succeeded', 'aborted', 'failed'.
+     *
+     * @return the status value
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set workflow status. Possible values include: 'active', 'expired', 'succeeded', 'aborted', 'failed'.
+     *
+     * @param status the status value to set
+     * @return the WorkflowInner object itself.
+     */
+    public WorkflowInner withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get operation direction. Possible values include: 'do', 'undo', 'cancel'.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set operation direction. Possible values include: 'do', 'undo', 'cancel'.
+     *
+     * @param operation the operation value to set
+     * @return the WorkflowInner object itself.
+     */
+    public WorkflowInner withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    /**
+     * Get workflow steps.
+     *
+     * @return the steps value
+     */
+    public String steps() {
+        return this.steps;
+    }
+
+    /**
+     * Set workflow steps.
+     *
+     * @param steps the steps value to set
+     * @return the WorkflowInner object itself.
+     */
+    public WorkflowInner withSteps(String steps) {
+        this.steps = steps;
+        return this;
+    }
+
+    /**
+     * Get workflow last operation identifier.
+     *
+     * @return the lastOperationId value
+     */
+    public String lastOperationId() {
+        return this.lastOperationId;
+    }
+
+    /**
+     * Set workflow last operation identifier.
+     *
+     * @param lastOperationId the lastOperationId value to set
+     * @return the WorkflowInner object itself.
+     */
+    public WorkflowInner withLastOperationId(String lastOperationId) {
+        this.lastOperationId = lastOperationId;
+        return this;
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowsInner.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowsInner.java
new file mode 100644
index 000000000000..be542c327041
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/WorkflowsInner.java
@@ -0,0 +1,252 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.storagesync.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.management.storagesync.StorageSyncErrorException;
+import com.microsoft.azure.management.storagesync.WorkflowsAbortHeaders;
+import com.microsoft.azure.management.storagesync.WorkflowsGetHeaders;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponseWithHeaders;
+import java.io.IOException;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in Workflows.
+ */
+public class WorkflowsInner {
+    /** The Retrofit service to perform REST calls. */
+    private WorkflowsService service;
+    /** The service client containing this operation class. */
+    private StorageSyncManagementClientImpl client;
+
+    /**
+     * Initializes an instance of WorkflowsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public WorkflowsInner(Retrofit retrofit, StorageSyncManagementClientImpl client) {
+        this.service = retrofit.create(WorkflowsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for Workflows to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface WorkflowsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.Workflows get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/workflows/{workflowId}")
+        Observable<Response<ResponseBody>> get(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("workflowId") String workflowId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.storagesync.Workflows abort" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StorageSync/storageSyncServices/{storageSyncServiceName}/workflows/{workflowId}/abort")
+        Observable<Response<ResponseBody>> abort(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("storageSyncServiceName") String storageSyncServiceName, @Path("workflowId") String workflowId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Get Workflows resource.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the WorkflowInner object if successful.
+     */
+    public WorkflowInner get(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId).toBlocking().single().body();
+    }
+
+    /**
+     * Get Workflows resource.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @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<WorkflowInner> getAsync(String resourceGroupName, String storageSyncServiceName, String workflowId, final ServiceCallback<WorkflowInner> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId), serviceCallback);
+    }
+
+    /**
+     * Get Workflows resource.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WorkflowInner object
+     */
+    public Observable<WorkflowInner> getAsync(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        return getWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId).map(new Func1<ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders>, WorkflowInner>() {
+            @Override
+            public WorkflowInner call(ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get Workflows resource.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the WorkflowInner object
+     */
+    public Observable<ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders>> getWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (workflowId == null) {
+            throw new IllegalArgumentException("Parameter workflowId 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.get(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, workflowId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<WorkflowInner, WorkflowsGetHeaders> getDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<WorkflowInner, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<WorkflowInner>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, WorkflowsGetHeaders.class);
+    }
+
+    /**
+     * Abort the given workflow.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws StorageSyncErrorException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void abort(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        abortWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId).toBlocking().single().body();
+    }
+
+    /**
+     * Abort the given workflow.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @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<Void> abortAsync(String resourceGroupName, String storageSyncServiceName, String workflowId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromHeaderResponse(abortWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId), serviceCallback);
+    }
+
+    /**
+     * Abort the given workflow.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<Void> abortAsync(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        return abortWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, workflowId).map(new Func1<ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders>, Void>() {
+            @Override
+            public Void call(ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Abort the given workflow.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param storageSyncServiceName Name of Storage Sync Service resource.
+     * @param workflowId workflow Id
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponseWithHeaders} object if successful.
+     */
+    public Observable<ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders>> abortWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String workflowId) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (storageSyncServiceName == null) {
+            throw new IllegalArgumentException("Parameter storageSyncServiceName is required and cannot be null.");
+        }
+        if (workflowId == null) {
+            throw new IllegalArgumentException("Parameter workflowId 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.abort(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, workflowId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders>>>() {
+                @Override
+                public Observable<ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders> clientResponse = abortDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponseWithHeaders<Void, WorkflowsAbortHeaders> abortDelegate(Response<ResponseBody> response) throws StorageSyncErrorException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, StorageSyncErrorException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(StorageSyncErrorException.class)
+                .buildWithHeaders(response, WorkflowsAbortHeaders.class);
+    }
+
+}
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/package-info.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/package-info.java
new file mode 100644
index 000000000000..a113bfc2f346
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for StorageSyncManagementClient.
+ * Microsoft Storage Sync Service API.
+ */
+package com.microsoft.azure.management.storagesync.implementation;
diff --git a/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/package-info.java b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/package-info.java
new file mode 100644
index 000000000000..c88f2423d2f3
--- /dev/null
+++ b/azure-mgmt-storagesync/src/main/java/com/microsoft/azure/management/storagesync/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for StorageSyncManagementClient.
+ * Microsoft Storage Sync Service API.
+ */
+package com.microsoft.azure.management.storagesync;
diff --git a/compute/resource-manager/v2017_03_30/pom.xml b/compute/resource-manager/v2017_03_30/pom.xml
index d01723da9dcf..93a34059510d 100644
--- a/compute/resource-manager/v2017_03_30/pom.xml
+++ b/compute/resource-manager/v2017_03_30/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.compute.v2017_03_30</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-compute</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Compute Management</name>
-    <description>This package contains Microsoft Compute Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.compute.v2017_03_30</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-compute</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Compute Management</name>
+    <description>This package contains Microsoft Compute Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AdditionalUnattendContent.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AdditionalUnattendContent.java
index 1e021a425f3b..d54b7d653c4f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AdditionalUnattendContent.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AdditionalUnattendContent.java
@@ -49,7 +49,7 @@ public class AdditionalUnattendContent {
     private String content;
 
     /**
-     * Get the passName value.
+     * Get the pass name. Currently, the only allowable value is OobeSystem. Possible values include: 'OobeSystem'.
      *
      * @return the passName value
      */
@@ -58,7 +58,7 @@ public PassNames passName() {
     }
 
     /**
-     * Set the passName value.
+     * Set the pass name. Currently, the only allowable value is OobeSystem. Possible values include: 'OobeSystem'.
      *
      * @param passName the passName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -69,7 +69,7 @@ public AdditionalUnattendContent withPassName(PassNames passName) {
     }
 
     /**
-     * Get the componentName value.
+     * Get the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup. Possible values include: 'Microsoft-Windows-Shell-Setup'.
      *
      * @return the componentName value
      */
@@ -78,7 +78,7 @@ public ComponentNames componentName() {
     }
 
     /**
-     * Set the componentName value.
+     * Set the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup. Possible values include: 'Microsoft-Windows-Shell-Setup'.
      *
      * @param componentName the componentName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -89,7 +89,7 @@ public AdditionalUnattendContent withComponentName(ComponentNames componentName)
     }
 
     /**
-     * Get the settingName value.
+     * Get specifies the name of the setting to which the content applies. Possible values are: FirstLogonCommands and AutoLogon. Possible values include: 'AutoLogon', 'FirstLogonCommands'.
      *
      * @return the settingName value
      */
@@ -98,7 +98,7 @@ public SettingNames settingName() {
     }
 
     /**
-     * Set the settingName value.
+     * Set specifies the name of the setting to which the content applies. Possible values are: FirstLogonCommands and AutoLogon. Possible values include: 'AutoLogon', 'FirstLogonCommands'.
      *
      * @param settingName the settingName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -109,7 +109,7 @@ public AdditionalUnattendContent withSettingName(SettingNames settingName) {
     }
 
     /**
-     * Get the content value.
+     * Get specifies the XML formatted content that is added to the unattend.xml file for the specified path and component. The XML must be less than 4KB and must include the root element for the setting or feature that is being inserted.
      *
      * @return the content value
      */
@@ -118,7 +118,7 @@ public String content() {
     }
 
     /**
-     * Set the content value.
+     * Set specifies the XML formatted content that is added to the unattend.xml file for the specified path and component. The XML must be less than 4KB and must include the root element for the setting or feature that is being inserted.
      *
      * @param content the content value to set
      * @return the AdditionalUnattendContent object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiEntityReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiEntityReference.java
index 780f20fac6e4..67561d8c5b9f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiEntityReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiEntityReference.java
@@ -22,7 +22,7 @@ public class ApiEntityReference {
     private String id;
 
     /**
-     * Get the id value.
+     * Get the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
      *
      * @return the id value
      */
@@ -31,7 +31,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
      *
      * @param id the id value to set
      * @return the ApiEntityReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiError.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiError.java
index 6d60d80ef4bc..d9e3d34b5427 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiError.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiError.java
@@ -46,7 +46,7 @@ public class ApiError {
     private String message;
 
     /**
-     * Get the details value.
+     * Get the Api error details.
      *
      * @return the details value
      */
@@ -55,7 +55,7 @@ public List<ApiErrorBase> details() {
     }
 
     /**
-     * Set the details value.
+     * Set the Api error details.
      *
      * @param details the details value to set
      * @return the ApiError object itself.
@@ -66,7 +66,7 @@ public ApiError withDetails(List<ApiErrorBase> details) {
     }
 
     /**
-     * Get the innererror value.
+     * Get the Api inner error.
      *
      * @return the innererror value
      */
@@ -75,7 +75,7 @@ public InnerError innererror() {
     }
 
     /**
-     * Set the innererror value.
+     * Set the Api inner error.
      *
      * @param innererror the innererror value to set
      * @return the ApiError object itself.
@@ -86,7 +86,7 @@ public ApiError withInnererror(InnerError innererror) {
     }
 
     /**
-     * Get the code value.
+     * Get the error code.
      *
      * @return the code value
      */
@@ -95,7 +95,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the error code.
      *
      * @param code the code value to set
      * @return the ApiError object itself.
@@ -106,7 +106,7 @@ public ApiError withCode(String code) {
     }
 
     /**
-     * Get the target value.
+     * Get the target of the particular error.
      *
      * @return the target value
      */
@@ -115,7 +115,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target of the particular error.
      *
      * @param target the target value to set
      * @return the ApiError object itself.
@@ -126,7 +126,7 @@ public ApiError withTarget(String target) {
     }
 
     /**
-     * Get the message value.
+     * Get the error message.
      *
      * @return the message value
      */
@@ -135,7 +135,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the error message.
      *
      * @param message the message value to set
      * @return the ApiError object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiErrorBase.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiErrorBase.java
index 111d1f884f01..4d7b8373f048 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiErrorBase.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ApiErrorBase.java
@@ -33,7 +33,7 @@ public class ApiErrorBase {
     private String message;
 
     /**
-     * Get the code value.
+     * Get the error code.
      *
      * @return the code value
      */
@@ -42,7 +42,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the error code.
      *
      * @param code the code value to set
      * @return the ApiErrorBase object itself.
@@ -53,7 +53,7 @@ public ApiErrorBase withCode(String code) {
     }
 
     /**
-     * Get the target value.
+     * Get the target of the particular error.
      *
      * @return the target value
      */
@@ -62,7 +62,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target of the particular error.
      *
      * @param target the target value to set
      * @return the ApiErrorBase object itself.
@@ -73,7 +73,7 @@ public ApiErrorBase withTarget(String target) {
     }
 
     /**
-     * Get the message value.
+     * Get the error message.
      *
      * @return the message value
      */
@@ -82,7 +82,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the error message.
      *
      * @param message the message value to set
      * @return the ApiErrorBase object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySet.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySet.java
index 8f3e1454ca0f..e410e5d2de3d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySet.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySet.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySets.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySets.java
index 53614f2f2fc2..72768dbcb96c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySets.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/AvailabilitySets.java
@@ -14,6 +14,7 @@
 import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
 import rx.Observable;
 import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.AvailabilitySetsInner;
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySetVirtualMachineSize;
@@ -21,7 +22,7 @@
 /**
  * Type representing AvailabilitySets.
  */
-public interface AvailabilitySets extends SupportsCreating<AvailabilitySet.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<AvailabilitySet>, SupportsListingByResourceGroup<AvailabilitySet>, HasInner<AvailabilitySetsInner> {
+public interface AvailabilitySets extends SupportsCreating<AvailabilitySet.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<AvailabilitySet>, SupportsListingByResourceGroup<AvailabilitySet>, SupportsListing<AvailabilitySet>, HasInner<AvailabilitySetsInner> {
     /**
      * Lists all available virtual machine sizes that can be used to create a new virtual machine in an existing availability set.
      *
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnostics.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnostics.java
index 2ef3ec5f9be0..54a98991df2a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnostics.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnostics.java
@@ -32,7 +32,7 @@ public class BootDiagnostics {
     private String storageUri;
 
     /**
-     * Get the enabled value.
+     * Get whether boot diagnostics should be enabled on the Virtual Machine.
      *
      * @return the enabled value
      */
@@ -41,7 +41,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set whether boot diagnostics should be enabled on the Virtual Machine.
      *
      * @param enabled the enabled value to set
      * @return the BootDiagnostics object itself.
@@ -52,7 +52,7 @@ public BootDiagnostics withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get the storageUri value.
+     * Get uri of the storage account to use for placing the console output and screenshot.
      *
      * @return the storageUri value
      */
@@ -61,7 +61,7 @@ public String storageUri() {
     }
 
     /**
-     * Set the storageUri value.
+     * Set uri of the storage account to use for placing the console output and screenshot.
      *
      * @param storageUri the storageUri value to set
      * @return the BootDiagnostics object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnosticsInstanceView.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnosticsInstanceView.java
index 197d6f4747b7..e9b57e135648 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnosticsInstanceView.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/BootDiagnosticsInstanceView.java
@@ -27,7 +27,7 @@ public class BootDiagnosticsInstanceView {
     private String serialConsoleLogBlobUri;
 
     /**
-     * Get the consoleScreenshotBlobUri value.
+     * Get the console screenshot blob URI.
      *
      * @return the consoleScreenshotBlobUri value
      */
@@ -36,7 +36,7 @@ public String consoleScreenshotBlobUri() {
     }
 
     /**
-     * Set the consoleScreenshotBlobUri value.
+     * Set the console screenshot blob URI.
      *
      * @param consoleScreenshotBlobUri the consoleScreenshotBlobUri value to set
      * @return the BootDiagnosticsInstanceView object itself.
@@ -47,7 +47,7 @@ public BootDiagnosticsInstanceView withConsoleScreenshotBlobUri(String consoleSc
     }
 
     /**
-     * Get the serialConsoleLogBlobUri value.
+     * Get the Linux serial console log blob Uri.
      *
      * @return the serialConsoleLogBlobUri value
      */
@@ -56,7 +56,7 @@ public String serialConsoleLogBlobUri() {
     }
 
     /**
-     * Set the serialConsoleLogBlobUri value.
+     * Set the Linux serial console log blob Uri.
      *
      * @param serialConsoleLogBlobUri the serialConsoleLogBlobUri value to set
      * @return the BootDiagnosticsInstanceView object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ComputeLongRunningOperationProperties.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ComputeLongRunningOperationProperties.java
index 1e80ed94605b..7b67cde1e6b7 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ComputeLongRunningOperationProperties.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ComputeLongRunningOperationProperties.java
@@ -21,7 +21,7 @@ public class ComputeLongRunningOperationProperties {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -30,7 +30,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the ComputeLongRunningOperationProperties object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/CreationData.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/CreationData.java
index 5527b2a627b1..4971c717a92b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/CreationData.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/CreationData.java
@@ -50,7 +50,7 @@ public class CreationData {
     private String sourceResourceId;
 
     /**
-     * Get the createOption value.
+     * Get this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy'.
      *
      * @return the createOption value
      */
@@ -59,7 +59,7 @@ public DiskCreateOption createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy'.
      *
      * @param createOption the createOption value to set
      * @return the CreationData object itself.
@@ -70,7 +70,7 @@ public CreationData withCreateOption(DiskCreateOption createOption) {
     }
 
     /**
-     * Get the storageAccountId value.
+     * Get if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
      *
      * @return the storageAccountId value
      */
@@ -79,7 +79,7 @@ public String storageAccountId() {
     }
 
     /**
-     * Set the storageAccountId value.
+     * Set if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
      *
      * @param storageAccountId the storageAccountId value to set
      * @return the CreationData object itself.
@@ -90,7 +90,7 @@ public CreationData withStorageAccountId(String storageAccountId) {
     }
 
     /**
-     * Get the imageReference value.
+     * Get disk source information.
      *
      * @return the imageReference value
      */
@@ -99,7 +99,7 @@ public ImageDiskReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set disk source information.
      *
      * @param imageReference the imageReference value to set
      * @return the CreationData object itself.
@@ -110,7 +110,7 @@ public CreationData withImageReference(ImageDiskReference imageReference) {
     }
 
     /**
-     * Get the sourceUri value.
+     * Get if createOption is Import, this is the URI of a blob to be imported into a managed disk.
      *
      * @return the sourceUri value
      */
@@ -119,7 +119,7 @@ public String sourceUri() {
     }
 
     /**
-     * Set the sourceUri value.
+     * Set if createOption is Import, this is the URI of a blob to be imported into a managed disk.
      *
      * @param sourceUri the sourceUri value to set
      * @return the CreationData object itself.
@@ -130,7 +130,7 @@ public CreationData withSourceUri(String sourceUri) {
     }
 
     /**
-     * Get the sourceResourceId value.
+     * Get if createOption is Copy, this is the ARM id of the source snapshot or disk.
      *
      * @return the sourceResourceId value
      */
@@ -139,7 +139,7 @@ public String sourceResourceId() {
     }
 
     /**
-     * Set the sourceResourceId value.
+     * Set if createOption is Copy, this is the ARM id of the source snapshot or disk.
      *
      * @param sourceResourceId the sourceResourceId value to set
      * @return the CreationData object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDisk.java
index d7e81c850def..67c3d8fd1c7f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDisk.java
@@ -68,7 +68,7 @@ public class DataDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -81,7 +81,7 @@ public class DataDisk {
     private ManagedDiskParameters managedDisk;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -90,7 +90,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the DataDisk object itself.
@@ -101,7 +101,7 @@ public DataDisk withLun(int lun) {
     }
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -110,7 +110,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the DataDisk object itself.
@@ -121,7 +121,7 @@ public DataDisk withName(String name) {
     }
 
     /**
-     * Get the vhd value.
+     * Get the virtual hard disk.
      *
      * @return the vhd value
      */
@@ -130,7 +130,7 @@ public VirtualHardDisk vhd() {
     }
 
     /**
-     * Set the vhd value.
+     * Set the virtual hard disk.
      *
      * @param vhd the vhd value to set
      * @return the DataDisk object itself.
@@ -141,7 +141,7 @@ public DataDisk withVhd(VirtualHardDisk vhd) {
     }
 
     /**
-     * Get the image value.
+     * Get the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @return the image value
      */
@@ -150,7 +150,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @param image the image value to set
      * @return the DataDisk object itself.
@@ -161,7 +161,7 @@ public DataDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -170,7 +170,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the DataDisk object itself.
@@ -181,7 +181,7 @@ public DataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -190,7 +190,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the DataDisk object itself.
@@ -201,7 +201,7 @@ public DataDisk withCreateOption(DiskCreateOptionTypes createOption) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -210,7 +210,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DataDisk object itself.
@@ -221,7 +221,7 @@ public DataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -230,7 +230,7 @@ public ManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the DataDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDiskImage.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDiskImage.java
index 117db573ad1c..d9deb1cb81f1 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDiskImage.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DataDiskImage.java
@@ -23,7 +23,7 @@ public class DataDiskImage {
     private Integer lun;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiagnosticsProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiagnosticsProfile.java
index 82a8085f79fb..3fc9ba6886e3 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiagnosticsProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiagnosticsProfile.java
@@ -27,7 +27,7 @@ public class DiagnosticsProfile {
     private BootDiagnostics bootDiagnostics;
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -36,7 +36,7 @@ public BootDiagnostics bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the DiagnosticsProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Disk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Disk.java
index ef32cc00e56d..4717ef58c2c4 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Disk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Disk.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskEncryptionSettings.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskEncryptionSettings.java
index c620e1103b1e..a5fcaf8f01d4 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskEncryptionSettings.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskEncryptionSettings.java
@@ -35,7 +35,7 @@ public class DiskEncryptionSettings {
     private Boolean enabled;
 
     /**
-     * Get the diskEncryptionKey value.
+     * Get specifies the location of the disk encryption key, which is a Key Vault Secret.
      *
      * @return the diskEncryptionKey value
      */
@@ -44,7 +44,7 @@ public KeyVaultSecretReference diskEncryptionKey() {
     }
 
     /**
-     * Set the diskEncryptionKey value.
+     * Set specifies the location of the disk encryption key, which is a Key Vault Secret.
      *
      * @param diskEncryptionKey the diskEncryptionKey value to set
      * @return the DiskEncryptionSettings object itself.
@@ -55,7 +55,7 @@ public DiskEncryptionSettings withDiskEncryptionKey(KeyVaultSecretReference disk
     }
 
     /**
-     * Get the keyEncryptionKey value.
+     * Get specifies the location of the key encryption key in Key Vault.
      *
      * @return the keyEncryptionKey value
      */
@@ -64,7 +64,7 @@ public KeyVaultKeyReference keyEncryptionKey() {
     }
 
     /**
-     * Set the keyEncryptionKey value.
+     * Set specifies the location of the key encryption key in Key Vault.
      *
      * @param keyEncryptionKey the keyEncryptionKey value to set
      * @return the DiskEncryptionSettings object itself.
@@ -75,7 +75,7 @@ public DiskEncryptionSettings withKeyEncryptionKey(KeyVaultKeyReference keyEncry
     }
 
     /**
-     * Get the enabled value.
+     * Get specifies whether disk encryption should be enabled on the virtual machine.
      *
      * @return the enabled value
      */
@@ -84,7 +84,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set specifies whether disk encryption should be enabled on the virtual machine.
      *
      * @param enabled the enabled value to set
      * @return the DiskEncryptionSettings object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskInstanceView.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskInstanceView.java
index c29354e3b09f..f8930bf6e40a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskInstanceView.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskInstanceView.java
@@ -35,7 +35,7 @@ public class DiskInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -44,7 +44,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the DiskInstanceView object itself.
@@ -55,7 +55,7 @@ public DiskInstanceView withName(String name) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the encryptionSettings value
      */
@@ -64,7 +64,7 @@ public List<DiskEncryptionSettings> encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskInstanceView object itself.
@@ -75,7 +75,7 @@ public DiskInstanceView withEncryptionSettings(List<DiskEncryptionSettings> encr
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -84,7 +84,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the DiskInstanceView object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskSku.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskSku.java
index 4553fd7a1ae6..c7a47a286bc0 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskSku.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskSku.java
@@ -27,7 +27,7 @@ public class DiskSku {
     private String tier;
 
     /**
-     * Get the name value.
+     * Get the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public StorageAccountTypes name() {
     }
 
     /**
-     * Set the name value.
+     * Set the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param name the name value to set
      * @return the DiskSku object itself.
@@ -47,7 +47,7 @@ public DiskSku withName(StorageAccountTypes name) {
     }
 
     /**
-     * Get the tier value.
+     * Get the sku tier.
      *
      * @return the tier value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskUpdate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskUpdate.java
index 3343d8e881d7..df2cd2561b24 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskUpdate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/DiskUpdate.java
@@ -39,7 +39,7 @@ public class DiskUpdate extends ResourceUpdate {
     private EncryptionSettings encryptionSettings;
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -48,7 +48,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the DiskUpdate object itself.
@@ -59,7 +59,7 @@ public DiskUpdate withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -68,7 +68,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DiskUpdate object itself.
@@ -79,7 +79,7 @@ public DiskUpdate withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -88,7 +88,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskUpdate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/EncryptionSettings.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/EncryptionSettings.java
index e2533114f0d5..c8a747e8ac2e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/EncryptionSettings.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/EncryptionSettings.java
@@ -37,7 +37,7 @@ public class EncryptionSettings {
     private KeyVaultAndKeyReference keyEncryptionKey;
 
     /**
-     * Get the enabled value.
+     * Get set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged.
      *
      * @return the enabled value
      */
@@ -46,7 +46,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged.
      *
      * @param enabled the enabled value to set
      * @return the EncryptionSettings object itself.
@@ -57,7 +57,7 @@ public EncryptionSettings withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get the diskEncryptionKey value.
+     * Get key Vault Secret Url and vault id of the disk encryption key.
      *
      * @return the diskEncryptionKey value
      */
@@ -66,7 +66,7 @@ public KeyVaultAndSecretReference diskEncryptionKey() {
     }
 
     /**
-     * Set the diskEncryptionKey value.
+     * Set key Vault Secret Url and vault id of the disk encryption key.
      *
      * @param diskEncryptionKey the diskEncryptionKey value to set
      * @return the EncryptionSettings object itself.
@@ -77,7 +77,7 @@ public EncryptionSettings withDiskEncryptionKey(KeyVaultAndSecretReference diskE
     }
 
     /**
-     * Get the keyEncryptionKey value.
+     * Get key Vault Key Url and vault id of the key encryption key.
      *
      * @return the keyEncryptionKey value
      */
@@ -86,7 +86,7 @@ public KeyVaultAndKeyReference keyEncryptionKey() {
     }
 
     /**
-     * Set the keyEncryptionKey value.
+     * Set key Vault Key Url and vault id of the key encryption key.
      *
      * @param keyEncryptionKey the keyEncryptionKey value to set
      * @return the EncryptionSettings object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/GrantAccessData.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/GrantAccessData.java
index 269f3bd389ae..aabb7590b9c6 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/GrantAccessData.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/GrantAccessData.java
@@ -27,7 +27,7 @@ public class GrantAccessData {
     private int durationInSeconds;
 
     /**
-     * Get the access value.
+     * Get possible values include: 'None', 'Read'.
      *
      * @return the access value
      */
@@ -36,7 +36,7 @@ public AccessLevel access() {
     }
 
     /**
-     * Set the access value.
+     * Set possible values include: 'None', 'Read'.
      *
      * @param access the access value to set
      * @return the GrantAccessData object itself.
@@ -47,7 +47,7 @@ public GrantAccessData withAccess(AccessLevel access) {
     }
 
     /**
-     * Get the durationInSeconds value.
+     * Get time duration in seconds until the SAS access expires.
      *
      * @return the durationInSeconds value
      */
@@ -56,7 +56,7 @@ public int durationInSeconds() {
     }
 
     /**
-     * Set the durationInSeconds value.
+     * Set time duration in seconds until the SAS access expires.
      *
      * @param durationInSeconds the durationInSeconds value to set
      * @return the GrantAccessData object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/HardwareProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/HardwareProfile.java
index a79d590dffa3..aa81dc512909 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/HardwareProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/HardwareProfile.java
@@ -56,7 +56,7 @@ public class HardwareProfile {
     private VirtualMachineSizeTypes vmSize;
 
     /**
-     * Get the vmSize value.
+     * Get specifies the size of the virtual machine. For more information about virtual machine sizes, see [Sizes for virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; The available VM sizes depend on region and availability set. For a list of available sizes use these APIs:  &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in an availability set](virtualmachines-list-sizes-availability-set.md) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in a region](virtualmachines-list-sizes-region.md) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes for resizing](virtualmachines-list-sizes-for-resizing.md). Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2', 'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8', 'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s', 'Standard_F8s', 'Standard_F16s', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m', 'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s', 'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'.
      *
      * @return the vmSize value
      */
@@ -65,7 +65,7 @@ public VirtualMachineSizeTypes vmSize() {
     }
 
     /**
-     * Set the vmSize value.
+     * Set specifies the size of the virtual machine. For more information about virtual machine sizes, see [Sizes for virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; The available VM sizes depend on region and availability set. For a list of available sizes use these APIs:  &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in an availability set](virtualmachines-list-sizes-availability-set.md) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in a region](virtualmachines-list-sizes-region.md) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes for resizing](virtualmachines-list-sizes-for-resizing.md). Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2', 'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8', 'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s', 'Standard_F8s', 'Standard_F16s', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m', 'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s', 'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'.
      *
      * @param vmSize the vmSize value to set
      * @return the HardwareProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Image.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Image.java
index cbc15ae9573e..019f68103717 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Image.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Image.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import com.microsoft.azure.SubResource;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDataDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDataDisk.java
index fc5113466878..6c150b5f2e92 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDataDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDataDisk.java
@@ -68,7 +68,7 @@ public class ImageDataDisk {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -77,7 +77,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the ImageDataDisk object itself.
@@ -88,7 +88,7 @@ public ImageDataDisk withLun(int lun) {
     }
 
     /**
-     * Get the snapshot value.
+     * Get the snapshot.
      *
      * @return the snapshot value
      */
@@ -97,7 +97,7 @@ public SubResource snapshot() {
     }
 
     /**
-     * Set the snapshot value.
+     * Set the snapshot.
      *
      * @param snapshot the snapshot value to set
      * @return the ImageDataDisk object itself.
@@ -108,7 +108,7 @@ public ImageDataDisk withSnapshot(SubResource snapshot) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managedDisk.
      *
      * @return the managedDisk value
      */
@@ -117,7 +117,7 @@ public SubResource managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managedDisk.
      *
      * @param managedDisk the managedDisk value to set
      * @return the ImageDataDisk object itself.
@@ -128,7 +128,7 @@ public ImageDataDisk withManagedDisk(SubResource managedDisk) {
     }
 
     /**
-     * Get the blobUri value.
+     * Get the Virtual Hard Disk.
      *
      * @return the blobUri value
      */
@@ -137,7 +137,7 @@ public String blobUri() {
     }
 
     /**
-     * Set the blobUri value.
+     * Set the Virtual Hard Disk.
      *
      * @param blobUri the blobUri value to set
      * @return the ImageDataDisk object itself.
@@ -148,7 +148,7 @@ public ImageDataDisk withBlobUri(String blobUri) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -157,7 +157,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the ImageDataDisk object itself.
@@ -168,7 +168,7 @@ public ImageDataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -177,7 +177,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the ImageDataDisk object itself.
@@ -188,7 +188,7 @@ public ImageDataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -197,7 +197,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ImageDataDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDiskReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDiskReference.java
index d2f6c55e2be0..9545a436d7ac 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDiskReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageDiskReference.java
@@ -30,7 +30,7 @@ public class ImageDiskReference {
     private Integer lun;
 
     /**
-     * Get the id value.
+     * Get a relative uri containing either a Platform Imgage Repository or user image reference.
      *
      * @return the id value
      */
@@ -39,7 +39,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set a relative uri containing either a Platform Imgage Repository or user image reference.
      *
      * @param id the id value to set
      * @return the ImageDiskReference object itself.
@@ -50,7 +50,7 @@ public ImageDiskReference withId(String id) {
     }
 
     /**
-     * Get the lun value.
+     * Get if the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
      *
      * @return the lun value
      */
@@ -59,7 +59,7 @@ public Integer lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set if the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
      *
      * @param lun the lun value to set
      * @return the ImageDiskReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageOSDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageOSDisk.java
index 0cd5387b9591..60b3b601e782 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageOSDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageOSDisk.java
@@ -76,7 +76,7 @@ public class ImageOSDisk {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from a custom image. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -85,7 +85,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from a custom image. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the ImageOSDisk object itself.
@@ -96,7 +96,7 @@ public ImageOSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the osState value.
+     * Get the OS State. Possible values include: 'Generalized', 'Specialized'.
      *
      * @return the osState value
      */
@@ -105,7 +105,7 @@ public OperatingSystemStateTypes osState() {
     }
 
     /**
-     * Set the osState value.
+     * Set the OS State. Possible values include: 'Generalized', 'Specialized'.
      *
      * @param osState the osState value to set
      * @return the ImageOSDisk object itself.
@@ -116,7 +116,7 @@ public ImageOSDisk withOsState(OperatingSystemStateTypes osState) {
     }
 
     /**
-     * Get the snapshot value.
+     * Get the snapshot.
      *
      * @return the snapshot value
      */
@@ -125,7 +125,7 @@ public SubResource snapshot() {
     }
 
     /**
-     * Set the snapshot value.
+     * Set the snapshot.
      *
      * @param snapshot the snapshot value to set
      * @return the ImageOSDisk object itself.
@@ -136,7 +136,7 @@ public ImageOSDisk withSnapshot(SubResource snapshot) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managedDisk.
      *
      * @return the managedDisk value
      */
@@ -145,7 +145,7 @@ public SubResource managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managedDisk.
      *
      * @param managedDisk the managedDisk value to set
      * @return the ImageOSDisk object itself.
@@ -156,7 +156,7 @@ public ImageOSDisk withManagedDisk(SubResource managedDisk) {
     }
 
     /**
-     * Get the blobUri value.
+     * Get the Virtual Hard Disk.
      *
      * @return the blobUri value
      */
@@ -165,7 +165,7 @@ public String blobUri() {
     }
 
     /**
-     * Set the blobUri value.
+     * Set the Virtual Hard Disk.
      *
      * @param blobUri the blobUri value to set
      * @return the ImageOSDisk object itself.
@@ -176,7 +176,7 @@ public ImageOSDisk withBlobUri(String blobUri) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -185,7 +185,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the ImageOSDisk object itself.
@@ -196,7 +196,7 @@ public ImageOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -205,7 +205,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the ImageOSDisk object itself.
@@ -216,7 +216,7 @@ public ImageOSDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -225,7 +225,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ImageOSDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageReference.java
index f4628da56b02..8cbce35a6a9d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageReference.java
@@ -50,7 +50,7 @@ public class ImageReference extends SubResource {
     private String version;
 
     /**
-     * Get the publisher value.
+     * Get the image publisher.
      *
      * @return the publisher value
      */
@@ -59,7 +59,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the image publisher.
      *
      * @param publisher the publisher value to set
      * @return the ImageReference object itself.
@@ -70,7 +70,7 @@ public ImageReference withPublisher(String publisher) {
     }
 
     /**
-     * Get the offer value.
+     * Get specifies the offer of the platform image or marketplace image used to create the virtual machine.
      *
      * @return the offer value
      */
@@ -79,7 +79,7 @@ public String offer() {
     }
 
     /**
-     * Set the offer value.
+     * Set specifies the offer of the platform image or marketplace image used to create the virtual machine.
      *
      * @param offer the offer value to set
      * @return the ImageReference object itself.
@@ -90,7 +90,7 @@ public ImageReference withOffer(String offer) {
     }
 
     /**
-     * Get the sku value.
+     * Get the image SKU.
      *
      * @return the sku value
      */
@@ -99,7 +99,7 @@ public String sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the image SKU.
      *
      * @param sku the sku value to set
      * @return the ImageReference object itself.
@@ -110,7 +110,7 @@ public ImageReference withSku(String sku) {
     }
 
     /**
-     * Get the version value.
+     * Get specifies the version of the platform image or marketplace image used to create the virtual machine. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.
      *
      * @return the version value
      */
@@ -119,7 +119,7 @@ public String version() {
     }
 
     /**
-     * Set the version value.
+     * Set specifies the version of the platform image or marketplace image used to create the virtual machine. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.
      *
      * @param version the version value to set
      * @return the ImageReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageStorageProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageStorageProfile.java
index 19ab4673d975..7ea1e6e2d336 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageStorageProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ImageStorageProfile.java
@@ -34,7 +34,7 @@ public class ImageStorageProfile {
     private List<ImageDataDisk> dataDisks;
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -43,7 +43,7 @@ public ImageOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the ImageStorageProfile object itself.
@@ -54,7 +54,7 @@ public ImageStorageProfile withOsDisk(ImageOSDisk osDisk) {
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -63,7 +63,7 @@ public List<ImageDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the ImageStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InnerError.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InnerError.java
index ef2224356287..39686b773ebb 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InnerError.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InnerError.java
@@ -27,7 +27,7 @@ public class InnerError {
     private String errordetail;
 
     /**
-     * Get the exceptiontype value.
+     * Get the exception type.
      *
      * @return the exceptiontype value
      */
@@ -36,7 +36,7 @@ public String exceptiontype() {
     }
 
     /**
-     * Set the exceptiontype value.
+     * Set the exception type.
      *
      * @param exceptiontype the exceptiontype value to set
      * @return the InnerError object itself.
@@ -47,7 +47,7 @@ public InnerError withExceptiontype(String exceptiontype) {
     }
 
     /**
-     * Get the errordetail value.
+     * Get the internal error message or exception dump.
      *
      * @return the errordetail value
      */
@@ -56,7 +56,7 @@ public String errordetail() {
     }
 
     /**
-     * Set the errordetail value.
+     * Set the internal error message or exception dump.
      *
      * @param errordetail the errordetail value to set
      * @return the InnerError object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InstanceViewStatus.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InstanceViewStatus.java
index 83146dedc4c6..240eb74005ed 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InstanceViewStatus.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/InstanceViewStatus.java
@@ -46,7 +46,7 @@ public class InstanceViewStatus {
     private DateTime time;
 
     /**
-     * Get the code value.
+     * Get the status code.
      *
      * @return the code value
      */
@@ -55,7 +55,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the status code.
      *
      * @param code the code value to set
      * @return the InstanceViewStatus object itself.
@@ -66,7 +66,7 @@ public InstanceViewStatus withCode(String code) {
     }
 
     /**
-     * Get the level value.
+     * Get the level code. Possible values include: 'Info', 'Warning', 'Error'.
      *
      * @return the level value
      */
@@ -75,7 +75,7 @@ public StatusLevelTypes level() {
     }
 
     /**
-     * Set the level value.
+     * Set the level code. Possible values include: 'Info', 'Warning', 'Error'.
      *
      * @param level the level value to set
      * @return the InstanceViewStatus object itself.
@@ -86,7 +86,7 @@ public InstanceViewStatus withLevel(StatusLevelTypes level) {
     }
 
     /**
-     * Get the displayStatus value.
+     * Get the short localizable label for the status.
      *
      * @return the displayStatus value
      */
@@ -95,7 +95,7 @@ public String displayStatus() {
     }
 
     /**
-     * Set the displayStatus value.
+     * Set the short localizable label for the status.
      *
      * @param displayStatus the displayStatus value to set
      * @return the InstanceViewStatus object itself.
@@ -106,7 +106,7 @@ public InstanceViewStatus withDisplayStatus(String displayStatus) {
     }
 
     /**
-     * Get the message value.
+     * Get the detailed status message, including for alerts and error messages.
      *
      * @return the message value
      */
@@ -115,7 +115,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the detailed status message, including for alerts and error messages.
      *
      * @param message the message value to set
      * @return the InstanceViewStatus object itself.
@@ -126,7 +126,7 @@ public InstanceViewStatus withMessage(String message) {
     }
 
     /**
-     * Get the time value.
+     * Get the time of the status.
      *
      * @return the time value
      */
@@ -135,7 +135,7 @@ public DateTime time() {
     }
 
     /**
-     * Set the time value.
+     * Set the time of the status.
      *
      * @param time the time value to set
      * @return the InstanceViewStatus object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndKeyReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndKeyReference.java
index 8a0588625b98..fb07a9fba56d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndKeyReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndKeyReference.java
@@ -28,7 +28,7 @@ public class KeyVaultAndKeyReference {
     private String keyUrl;
 
     /**
-     * Get the sourceVault value.
+     * Get resource id of the KeyVault containing the key or secret.
      *
      * @return the sourceVault value
      */
@@ -37,7 +37,7 @@ public SourceVault sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set resource id of the KeyVault containing the key or secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultAndKeyReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultAndKeyReference withSourceVault(SourceVault sourceVault) {
     }
 
     /**
-     * Get the keyUrl value.
+     * Get url pointing to a key or secret in KeyVault.
      *
      * @return the keyUrl value
      */
@@ -57,7 +57,7 @@ public String keyUrl() {
     }
 
     /**
-     * Set the keyUrl value.
+     * Set url pointing to a key or secret in KeyVault.
      *
      * @param keyUrl the keyUrl value to set
      * @return the KeyVaultAndKeyReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndSecretReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndSecretReference.java
index 70aa42302d47..c46874bc4134 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndSecretReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultAndSecretReference.java
@@ -27,7 +27,7 @@ public class KeyVaultAndSecretReference {
     private String secretUrl;
 
     /**
-     * Get the sourceVault value.
+     * Get resource id of the KeyVault containing the key or secret.
      *
      * @return the sourceVault value
      */
@@ -36,7 +36,7 @@ public SourceVault sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set resource id of the KeyVault containing the key or secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultAndSecretReference object itself.
@@ -47,7 +47,7 @@ public KeyVaultAndSecretReference withSourceVault(SourceVault sourceVault) {
     }
 
     /**
-     * Get the secretUrl value.
+     * Get url pointing to a key or secret in KeyVault.
      *
      * @return the secretUrl value
      */
@@ -56,7 +56,7 @@ public String secretUrl() {
     }
 
     /**
-     * Set the secretUrl value.
+     * Set url pointing to a key or secret in KeyVault.
      *
      * @param secretUrl the secretUrl value to set
      * @return the KeyVaultAndSecretReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultKeyReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultKeyReference.java
index f8b4d8c2c1f9..30736bb82e39 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultKeyReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultKeyReference.java
@@ -28,7 +28,7 @@ public class KeyVaultKeyReference {
     private SubResource sourceVault;
 
     /**
-     * Get the keyUrl value.
+     * Get the URL referencing a key encryption key in Key Vault.
      *
      * @return the keyUrl value
      */
@@ -37,7 +37,7 @@ public String keyUrl() {
     }
 
     /**
-     * Set the keyUrl value.
+     * Set the URL referencing a key encryption key in Key Vault.
      *
      * @param keyUrl the keyUrl value to set
      * @return the KeyVaultKeyReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultKeyReference withKeyUrl(String keyUrl) {
     }
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing the key.
      *
      * @return the sourceVault value
      */
@@ -57,7 +57,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing the key.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultKeyReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultSecretReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultSecretReference.java
index d0cbec1e2153..0a197e6eee37 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultSecretReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/KeyVaultSecretReference.java
@@ -28,7 +28,7 @@ public class KeyVaultSecretReference {
     private SubResource sourceVault;
 
     /**
-     * Get the secretUrl value.
+     * Get the URL referencing a secret in a Key Vault.
      *
      * @return the secretUrl value
      */
@@ -37,7 +37,7 @@ public String secretUrl() {
     }
 
     /**
-     * Set the secretUrl value.
+     * Set the URL referencing a secret in a Key Vault.
      *
      * @param secretUrl the secretUrl value to set
      * @return the KeyVaultSecretReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultSecretReference withSecretUrl(String secretUrl) {
     }
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing the secret.
      *
      * @return the sourceVault value
      */
@@ -57,7 +57,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing the secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultSecretReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/LinuxConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/LinuxConfiguration.java
index d7056f9e7d77..c0a4276fa73c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/LinuxConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/LinuxConfiguration.java
@@ -33,7 +33,7 @@ public class LinuxConfiguration {
     private SshConfiguration ssh;
 
     /**
-     * Get the disablePasswordAuthentication value.
+     * Get specifies whether password authentication should be disabled.
      *
      * @return the disablePasswordAuthentication value
      */
@@ -42,7 +42,7 @@ public Boolean disablePasswordAuthentication() {
     }
 
     /**
-     * Set the disablePasswordAuthentication value.
+     * Set specifies whether password authentication should be disabled.
      *
      * @param disablePasswordAuthentication the disablePasswordAuthentication value to set
      * @return the LinuxConfiguration object itself.
@@ -53,7 +53,7 @@ public LinuxConfiguration withDisablePasswordAuthentication(Boolean disablePassw
     }
 
     /**
-     * Get the ssh value.
+     * Get specifies the ssh key configuration for a Linux OS.
      *
      * @return the ssh value
      */
@@ -62,7 +62,7 @@ public SshConfiguration ssh() {
     }
 
     /**
-     * Set the ssh value.
+     * Set specifies the ssh key configuration for a Linux OS.
      *
      * @param ssh the ssh value to set
      * @return the LinuxConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/MaintenanceRedeployStatus.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/MaintenanceRedeployStatus.java
index fa0a4b0a5f13..17ec8ba75fa0 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/MaintenanceRedeployStatus.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/MaintenanceRedeployStatus.java
@@ -59,7 +59,7 @@ public class MaintenanceRedeployStatus {
     private String lastOperationMessage;
 
     /**
-     * Get the isCustomerInitiatedMaintenanceAllowed value.
+     * Get true, if customer is allowed to perform Maintenance.
      *
      * @return the isCustomerInitiatedMaintenanceAllowed value
      */
@@ -68,7 +68,7 @@ public Boolean isCustomerInitiatedMaintenanceAllowed() {
     }
 
     /**
-     * Set the isCustomerInitiatedMaintenanceAllowed value.
+     * Set true, if customer is allowed to perform Maintenance.
      *
      * @param isCustomerInitiatedMaintenanceAllowed the isCustomerInitiatedMaintenanceAllowed value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -79,7 +79,7 @@ public MaintenanceRedeployStatus withIsCustomerInitiatedMaintenanceAllowed(Boole
     }
 
     /**
-     * Get the preMaintenanceWindowStartTime value.
+     * Get start Time for the Pre Maintenance Window.
      *
      * @return the preMaintenanceWindowStartTime value
      */
@@ -88,7 +88,7 @@ public DateTime preMaintenanceWindowStartTime() {
     }
 
     /**
-     * Set the preMaintenanceWindowStartTime value.
+     * Set start Time for the Pre Maintenance Window.
      *
      * @param preMaintenanceWindowStartTime the preMaintenanceWindowStartTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -99,7 +99,7 @@ public MaintenanceRedeployStatus withPreMaintenanceWindowStartTime(DateTime preM
     }
 
     /**
-     * Get the preMaintenanceWindowEndTime value.
+     * Get end Time for the Pre Maintenance Window.
      *
      * @return the preMaintenanceWindowEndTime value
      */
@@ -108,7 +108,7 @@ public DateTime preMaintenanceWindowEndTime() {
     }
 
     /**
-     * Set the preMaintenanceWindowEndTime value.
+     * Set end Time for the Pre Maintenance Window.
      *
      * @param preMaintenanceWindowEndTime the preMaintenanceWindowEndTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -119,7 +119,7 @@ public MaintenanceRedeployStatus withPreMaintenanceWindowEndTime(DateTime preMai
     }
 
     /**
-     * Get the maintenanceWindowStartTime value.
+     * Get start Time for the Maintenance Window.
      *
      * @return the maintenanceWindowStartTime value
      */
@@ -128,7 +128,7 @@ public DateTime maintenanceWindowStartTime() {
     }
 
     /**
-     * Set the maintenanceWindowStartTime value.
+     * Set start Time for the Maintenance Window.
      *
      * @param maintenanceWindowStartTime the maintenanceWindowStartTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -139,7 +139,7 @@ public MaintenanceRedeployStatus withMaintenanceWindowStartTime(DateTime mainten
     }
 
     /**
-     * Get the maintenanceWindowEndTime value.
+     * Get end Time for the Maintenance Window.
      *
      * @return the maintenanceWindowEndTime value
      */
@@ -148,7 +148,7 @@ public DateTime maintenanceWindowEndTime() {
     }
 
     /**
-     * Set the maintenanceWindowEndTime value.
+     * Set end Time for the Maintenance Window.
      *
      * @param maintenanceWindowEndTime the maintenanceWindowEndTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -159,7 +159,7 @@ public MaintenanceRedeployStatus withMaintenanceWindowEndTime(DateTime maintenan
     }
 
     /**
-     * Get the lastOperationResultCode value.
+     * Get the Last Maintenance Operation Result Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted', 'MaintenanceCompleted'.
      *
      * @return the lastOperationResultCode value
      */
@@ -168,7 +168,7 @@ public MaintenanceOperationResultCodeTypes lastOperationResultCode() {
     }
 
     /**
-     * Set the lastOperationResultCode value.
+     * Set the Last Maintenance Operation Result Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted', 'MaintenanceCompleted'.
      *
      * @param lastOperationResultCode the lastOperationResultCode value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -179,7 +179,7 @@ public MaintenanceRedeployStatus withLastOperationResultCode(MaintenanceOperatio
     }
 
     /**
-     * Get the lastOperationMessage value.
+     * Get message returned for the last Maintenance Operation.
      *
      * @return the lastOperationMessage value
      */
@@ -188,7 +188,7 @@ public String lastOperationMessage() {
     }
 
     /**
-     * Set the lastOperationMessage value.
+     * Set message returned for the last Maintenance Operation.
      *
      * @param lastOperationMessage the lastOperationMessage value to set
      * @return the MaintenanceRedeployStatus object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ManagedDiskParameters.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ManagedDiskParameters.java
index 6d69039603bb..36f65fc88c69 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ManagedDiskParameters.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ManagedDiskParameters.java
@@ -24,7 +24,7 @@ public class ManagedDiskParameters extends SubResource {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -33,7 +33,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ManagedDiskParameters object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkInterfaceReference.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkInterfaceReference.java
index 8553d6aa81d4..5225efaa0f5b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkInterfaceReference.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkInterfaceReference.java
@@ -25,7 +25,7 @@ public class NetworkInterfaceReference extends SubResource {
     private Boolean primary;
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -34,7 +34,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the NetworkInterfaceReference object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkProfile.java
index e8edfe4a7620..d36ed30525f7 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/NetworkProfile.java
@@ -23,7 +23,7 @@ public class NetworkProfile {
     private List<NetworkInterfaceReference> networkInterfaces;
 
     /**
-     * Get the networkInterfaces value.
+     * Get specifies the list of resource Ids for the network interfaces associated with the virtual machine.
      *
      * @return the networkInterfaces value
      */
@@ -32,7 +32,7 @@ public List<NetworkInterfaceReference> networkInterfaces() {
     }
 
     /**
-     * Set the networkInterfaces value.
+     * Set specifies the list of resource Ids for the network interfaces associated with the virtual machine.
      *
      * @param networkInterfaces the networkInterfaces value to set
      * @return the NetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDisk.java
index a0d129ab063f..0f9e8bbf9876 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDisk.java
@@ -80,7 +80,7 @@ public class OSDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -93,7 +93,7 @@ public class OSDisk {
     private ManagedDiskParameters managedDisk;
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -102,7 +102,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the OSDisk object itself.
@@ -113,7 +113,7 @@ public OSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the encryptionSettings value
      */
@@ -122,7 +122,7 @@ public DiskEncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the OSDisk object itself.
@@ -133,7 +133,7 @@ public OSDisk withEncryptionSettings(DiskEncryptionSettings encryptionSettings)
     }
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -142,7 +142,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the OSDisk object itself.
@@ -153,7 +153,7 @@ public OSDisk withName(String name) {
     }
 
     /**
-     * Get the vhd value.
+     * Get the virtual hard disk.
      *
      * @return the vhd value
      */
@@ -162,7 +162,7 @@ public VirtualHardDisk vhd() {
     }
 
     /**
-     * Set the vhd value.
+     * Set the virtual hard disk.
      *
      * @param vhd the vhd value to set
      * @return the OSDisk object itself.
@@ -173,7 +173,7 @@ public OSDisk withVhd(VirtualHardDisk vhd) {
     }
 
     /**
-     * Get the image value.
+     * Get the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @return the image value
      */
@@ -182,7 +182,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @param image the image value to set
      * @return the OSDisk object itself.
@@ -193,7 +193,7 @@ public OSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -202,7 +202,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the OSDisk object itself.
@@ -213,7 +213,7 @@ public OSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -222,7 +222,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the OSDisk object itself.
@@ -233,7 +233,7 @@ public OSDisk withCreateOption(DiskCreateOptionTypes createOption) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -242,7 +242,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the OSDisk object itself.
@@ -253,7 +253,7 @@ public OSDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -262,7 +262,7 @@ public ManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the OSDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDiskImage.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDiskImage.java
index b6b6c778503b..2d200db4f14f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDiskImage.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSDiskImage.java
@@ -22,7 +22,7 @@ public class OSDiskImage {
     private OperatingSystemTypes operatingSystem;
 
     /**
-     * Get the operatingSystem value.
+     * Get the operating system of the osDiskImage. Possible values include: 'Windows', 'Linux'.
      *
      * @return the operatingSystem value
      */
@@ -31,7 +31,7 @@ public OperatingSystemTypes operatingSystem() {
     }
 
     /**
-     * Set the operatingSystem value.
+     * Set the operating system of the osDiskImage. Possible values include: 'Windows', 'Linux'.
      *
      * @param operatingSystem the operatingSystem value to set
      * @return the OSDiskImage object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSProfile.java
index 372f280d6665..f6cbf3b6ffab 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/OSProfile.java
@@ -106,7 +106,7 @@ public class OSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the computerName value.
+     * Get specifies the host OS name of the virtual machine. &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 15 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters. &lt;br&gt;&lt;br&gt; For naming conventions and restrictions see [Azure infrastructure services implementation guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
      *
      * @return the computerName value
      */
@@ -115,7 +115,7 @@ public String computerName() {
     }
 
     /**
-     * Set the computerName value.
+     * Set specifies the host OS name of the virtual machine. &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 15 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters. &lt;br&gt;&lt;br&gt; For naming conventions and restrictions see [Azure infrastructure services implementation guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
      *
      * @param computerName the computerName value to set
      * @return the OSProfile object itself.
@@ -126,7 +126,7 @@ public OSProfile withComputerName(String computerName) {
     }
 
     /**
-     * Get the adminUsername value.
+     * Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the adminUsername value
      */
@@ -135,7 +135,7 @@ public String adminUsername() {
     }
 
     /**
-     * Set the adminUsername value.
+     * Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param adminUsername the adminUsername value to set
      * @return the OSProfile object itself.
@@ -146,7 +146,7 @@ public OSProfile withAdminUsername(String adminUsername) {
     }
 
     /**
-     * Get the adminPassword value.
+     * Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @return the adminPassword value
      */
@@ -155,7 +155,7 @@ public String adminPassword() {
     }
 
     /**
-     * Set the adminPassword value.
+     * Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @param adminPassword the adminPassword value to set
      * @return the OSProfile object itself.
@@ -166,7 +166,7 @@ public OSProfile withAdminPassword(String adminPassword) {
     }
 
     /**
-     * Get the customData value.
+     * Get specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the customData value
      */
@@ -175,7 +175,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param customData the customData value to set
      * @return the OSProfile object itself.
@@ -186,7 +186,7 @@ public OSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get specifies Windows operating system settings on the virtual machine.
      *
      * @return the windowsConfiguration value
      */
@@ -195,7 +195,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set specifies Windows operating system settings on the virtual machine.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the OSProfile object itself.
@@ -206,7 +206,7 @@ public OSProfile withWindowsConfiguration(WindowsConfiguration windowsConfigurat
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the linuxConfiguration value
      */
@@ -215,7 +215,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the OSProfile object itself.
@@ -226,7 +226,7 @@ public OSProfile withLinuxConfiguration(LinuxConfiguration linuxConfiguration) {
     }
 
     /**
-     * Get the secrets value.
+     * Get specifies set of certificates that should be installed onto the virtual machine.
      *
      * @return the secrets value
      */
@@ -235,7 +235,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set specifies set of certificates that should be installed onto the virtual machine.
      *
      * @param secrets the secrets value to set
      * @return the OSProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Plan.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Plan.java
index ea8af0465e33..b3c52da364c1 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Plan.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Plan.java
@@ -45,7 +45,7 @@ public class Plan {
     private String promotionCode;
 
     /**
-     * Get the name value.
+     * Get the plan ID.
      *
      * @return the name value
      */
@@ -54,7 +54,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the plan ID.
      *
      * @param name the name value to set
      * @return the Plan object itself.
@@ -65,7 +65,7 @@ public Plan withName(String name) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the publisher ID.
      *
      * @return the publisher value
      */
@@ -74,7 +74,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the publisher ID.
      *
      * @param publisher the publisher value to set
      * @return the Plan object itself.
@@ -85,7 +85,7 @@ public Plan withPublisher(String publisher) {
     }
 
     /**
-     * Get the product value.
+     * Get specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @return the product value
      */
@@ -94,7 +94,7 @@ public String product() {
     }
 
     /**
-     * Set the product value.
+     * Set specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @param product the product value to set
      * @return the Plan object itself.
@@ -105,7 +105,7 @@ public Plan withProduct(String product) {
     }
 
     /**
-     * Get the promotionCode value.
+     * Get the promotion code.
      *
      * @return the promotionCode value
      */
@@ -114,7 +114,7 @@ public String promotionCode() {
     }
 
     /**
-     * Set the promotionCode value.
+     * Set the promotion code.
      *
      * @param promotionCode the promotionCode value to set
      * @return the Plan object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/PurchasePlan.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/PurchasePlan.java
index c6b8b38373d6..80dd7929dda2 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/PurchasePlan.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/PurchasePlan.java
@@ -35,7 +35,7 @@ public class PurchasePlan {
     private String product;
 
     /**
-     * Get the publisher value.
+     * Get the publisher ID.
      *
      * @return the publisher value
      */
@@ -44,7 +44,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the publisher ID.
      *
      * @param publisher the publisher value to set
      * @return the PurchasePlan object itself.
@@ -55,7 +55,7 @@ public PurchasePlan withPublisher(String publisher) {
     }
 
     /**
-     * Get the name value.
+     * Get the plan ID.
      *
      * @return the name value
      */
@@ -64,7 +64,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the plan ID.
      *
      * @param name the name value to set
      * @return the PurchasePlan object itself.
@@ -75,7 +75,7 @@ public PurchasePlan withName(String name) {
     }
 
     /**
-     * Get the product value.
+     * Get specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @return the product value
      */
@@ -84,7 +84,7 @@ public String product() {
     }
 
     /**
-     * Set the product value.
+     * Set specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @param product the product value to set
      * @return the PurchasePlan object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapabilities.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapabilities.java
index a1f98845a923..e66a820a7a08 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapabilities.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapabilities.java
@@ -27,7 +27,7 @@ public class ResourceSkuCapabilities {
     private String value;
 
     /**
-     * Get the name value.
+     * Get an invariant to describe the feature.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public String name() {
     }
 
     /**
-     * Get the value value.
+     * Get an invariant if the feature is measured by quantity.
      *
      * @return the value value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapacity.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapacity.java
index b92ad333bcb4..2d9e7390ae82 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapacity.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCapacity.java
@@ -40,7 +40,7 @@ public class ResourceSkuCapacity {
     private ResourceSkuCapacityScaleType scaleType;
 
     /**
-     * Get the minimum value.
+     * Get the minimum capacity.
      *
      * @return the minimum value
      */
@@ -49,7 +49,7 @@ public Long minimum() {
     }
 
     /**
-     * Get the maximum value.
+     * Get the maximum capacity that can be set.
      *
      * @return the maximum value
      */
@@ -58,7 +58,7 @@ public Long maximum() {
     }
 
     /**
-     * Get the defaultProperty value.
+     * Get the default capacity.
      *
      * @return the defaultProperty value
      */
@@ -67,7 +67,7 @@ public Long defaultProperty() {
     }
 
     /**
-     * Get the scaleType value.
+     * Get the scale type applicable to the sku. Possible values include: 'Automatic', 'Manual', 'None'.
      *
      * @return the scaleType value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCosts.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCosts.java
index 49fa4c8f3afd..6971aecc0acd 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCosts.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuCosts.java
@@ -33,7 +33,7 @@ public class ResourceSkuCosts {
     private String extendedUnit;
 
     /**
-     * Get the meterID value.
+     * Get used for querying price from commerce.
      *
      * @return the meterID value
      */
@@ -42,7 +42,7 @@ public String meterID() {
     }
 
     /**
-     * Get the quantity value.
+     * Get the multiplier is needed to extend the base metered cost.
      *
      * @return the quantity value
      */
@@ -51,7 +51,7 @@ public Long quantity() {
     }
 
     /**
-     * Get the extendedUnit value.
+     * Get an invariant to show the extended unit.
      *
      * @return the extendedUnit value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuRestrictions.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuRestrictions.java
index fadb25ca8a34..ac2193609bbb 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuRestrictions.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceSkuRestrictions.java
@@ -36,7 +36,7 @@ public class ResourceSkuRestrictions {
     private ResourceSkuRestrictionsReasonCode reasonCode;
 
     /**
-     * Get the type value.
+     * Get the type of restrictions. Possible values include: 'Location'.
      *
      * @return the type value
      */
@@ -45,7 +45,7 @@ public ResourceSkuRestrictionsType type() {
     }
 
     /**
-     * Get the values value.
+     * Get the value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted.
      *
      * @return the values value
      */
@@ -54,7 +54,7 @@ public List<String> values() {
     }
 
     /**
-     * Get the reasonCode value.
+     * Get the reason for restriction. Possible values include: 'QuotaId', 'NotAvailableForSubscription'.
      *
      * @return the reasonCode value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceUpdate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceUpdate.java
index 43b53a0b09d0..fe5c6e388b0e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceUpdate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/ResourceUpdate.java
@@ -28,7 +28,7 @@ public class ResourceUpdate {
     private DiskSku sku;
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -37,7 +37,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the ResourceUpdate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradePolicy.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradePolicy.java
index 0c2047938a13..3bc1dcee0c74 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradePolicy.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradePolicy.java
@@ -53,7 +53,7 @@ public class RollingUpgradePolicy {
     private String pauseTimeBetweenBatches;
 
     /**
-     * Get the maxBatchInstancePercent value.
+     * Get the maximum percent of total virtual machine instances that will be upgraded simultaneously by the rolling upgrade in one batch. As this is a maximum, unhealthy instances in previous or future batches can cause the percentage of instances in a batch to decrease to ensure higher reliability. The default value for this parameter is 20%.
      *
      * @return the maxBatchInstancePercent value
      */
@@ -62,7 +62,7 @@ public Integer maxBatchInstancePercent() {
     }
 
     /**
-     * Set the maxBatchInstancePercent value.
+     * Set the maximum percent of total virtual machine instances that will be upgraded simultaneously by the rolling upgrade in one batch. As this is a maximum, unhealthy instances in previous or future batches can cause the percentage of instances in a batch to decrease to ensure higher reliability. The default value for this parameter is 20%.
      *
      * @param maxBatchInstancePercent the maxBatchInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -73,7 +73,7 @@ public RollingUpgradePolicy withMaxBatchInstancePercent(Integer maxBatchInstance
     }
 
     /**
-     * Get the maxUnhealthyInstancePercent value.
+     * Get the maximum percentage of the total virtual machine instances in the scale set that can be simultaneously unhealthy, either as a result of being upgraded, or by being found in an unhealthy state by the virtual machine health checks before the rolling upgrade aborts. This constraint will be checked prior to starting any batch. The default value for this parameter is 20%.
      *
      * @return the maxUnhealthyInstancePercent value
      */
@@ -82,7 +82,7 @@ public Integer maxUnhealthyInstancePercent() {
     }
 
     /**
-     * Set the maxUnhealthyInstancePercent value.
+     * Set the maximum percentage of the total virtual machine instances in the scale set that can be simultaneously unhealthy, either as a result of being upgraded, or by being found in an unhealthy state by the virtual machine health checks before the rolling upgrade aborts. This constraint will be checked prior to starting any batch. The default value for this parameter is 20%.
      *
      * @param maxUnhealthyInstancePercent the maxUnhealthyInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -93,7 +93,7 @@ public RollingUpgradePolicy withMaxUnhealthyInstancePercent(Integer maxUnhealthy
     }
 
     /**
-     * Get the maxUnhealthyUpgradedInstancePercent value.
+     * Get the maximum percentage of upgraded virtual machine instances that can be found to be in an unhealthy state. This check will happen after each batch is upgraded. If this percentage is ever exceeded, the rolling update aborts. The default value for this parameter is 20%.
      *
      * @return the maxUnhealthyUpgradedInstancePercent value
      */
@@ -102,7 +102,7 @@ public Integer maxUnhealthyUpgradedInstancePercent() {
     }
 
     /**
-     * Set the maxUnhealthyUpgradedInstancePercent value.
+     * Set the maximum percentage of upgraded virtual machine instances that can be found to be in an unhealthy state. This check will happen after each batch is upgraded. If this percentage is ever exceeded, the rolling update aborts. The default value for this parameter is 20%.
      *
      * @param maxUnhealthyUpgradedInstancePercent the maxUnhealthyUpgradedInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -113,7 +113,7 @@ public RollingUpgradePolicy withMaxUnhealthyUpgradedInstancePercent(Integer maxU
     }
 
     /**
-     * Get the pauseTimeBetweenBatches value.
+     * Get the wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S).
      *
      * @return the pauseTimeBetweenBatches value
      */
@@ -122,7 +122,7 @@ public String pauseTimeBetweenBatches() {
     }
 
     /**
-     * Set the pauseTimeBetweenBatches value.
+     * Set the wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S).
      *
      * @param pauseTimeBetweenBatches the pauseTimeBetweenBatches value to set
      * @return the RollingUpgradePolicy object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeProgressInfo.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeProgressInfo.java
index c40663aaf727..b0fd0131324c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeProgressInfo.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeProgressInfo.java
@@ -40,7 +40,7 @@ public class RollingUpgradeProgressInfo {
     private Integer pendingInstanceCount;
 
     /**
-     * Get the successfulInstanceCount value.
+     * Get the number of instances that have been successfully upgraded.
      *
      * @return the successfulInstanceCount value
      */
@@ -49,7 +49,7 @@ public Integer successfulInstanceCount() {
     }
 
     /**
-     * Get the failedInstanceCount value.
+     * Get the number of instances that have failed to be upgraded successfully.
      *
      * @return the failedInstanceCount value
      */
@@ -58,7 +58,7 @@ public Integer failedInstanceCount() {
     }
 
     /**
-     * Get the inProgressInstanceCount value.
+     * Get the number of instances that are currently being upgraded.
      *
      * @return the inProgressInstanceCount value
      */
@@ -67,7 +67,7 @@ public Integer inProgressInstanceCount() {
     }
 
     /**
-     * Get the pendingInstanceCount value.
+     * Get the number of instances that have not yet begun to be upgraded.
      *
      * @return the pendingInstanceCount value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeRunningStatus.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeRunningStatus.java
index 1d87ba6ae4a7..91eba7a0cca2 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeRunningStatus.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RollingUpgradeRunningStatus.java
@@ -42,7 +42,7 @@ public class RollingUpgradeRunningStatus {
     private DateTime lastActionTime;
 
     /**
-     * Get the code value.
+     * Get code indicating the current status of the upgrade. Possible values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'.
      *
      * @return the code value
      */
@@ -51,7 +51,7 @@ public RollingUpgradeStatusCode code() {
     }
 
     /**
-     * Get the startTime value.
+     * Get start time of the upgrade.
      *
      * @return the startTime value
      */
@@ -60,7 +60,7 @@ public DateTime startTime() {
     }
 
     /**
-     * Get the lastAction value.
+     * Get the last action performed on the rolling upgrade. Possible values include: 'Start', 'Cancel'.
      *
      * @return the lastAction value
      */
@@ -69,7 +69,7 @@ public RollingUpgradeActionType lastAction() {
     }
 
     /**
-     * Get the lastActionTime value.
+     * Get last action time of the upgrade.
      *
      * @return the lastActionTime value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInput.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInput.java
index 9ce3c32a0a64..437a4987ab84 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInput.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInput.java
@@ -35,7 +35,7 @@ public class RunCommandInput {
     private List<RunCommandInputParameter> parameters;
 
     /**
-     * Get the commandId value.
+     * Get the run command id.
      *
      * @return the commandId value
      */
@@ -44,7 +44,7 @@ public String commandId() {
     }
 
     /**
-     * Set the commandId value.
+     * Set the run command id.
      *
      * @param commandId the commandId value to set
      * @return the RunCommandInput object itself.
@@ -55,7 +55,7 @@ public RunCommandInput withCommandId(String commandId) {
     }
 
     /**
-     * Get the script value.
+     * Get optional. The script to be executed.  When this value is given, the given script will override the default script of the command.
      *
      * @return the script value
      */
@@ -64,7 +64,7 @@ public List<String> script() {
     }
 
     /**
-     * Set the script value.
+     * Set optional. The script to be executed.  When this value is given, the given script will override the default script of the command.
      *
      * @param script the script value to set
      * @return the RunCommandInput object itself.
@@ -75,7 +75,7 @@ public RunCommandInput withScript(List<String> script) {
     }
 
     /**
-     * Get the parameters value.
+     * Get the run command parameters.
      *
      * @return the parameters value
      */
@@ -84,7 +84,7 @@ public List<RunCommandInputParameter> parameters() {
     }
 
     /**
-     * Set the parameters value.
+     * Set the run command parameters.
      *
      * @param parameters the parameters value to set
      * @return the RunCommandInput object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInputParameter.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInputParameter.java
index 39d60c16004c..8d344b7a2961 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInputParameter.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandInputParameter.java
@@ -27,7 +27,7 @@ public class RunCommandInputParameter {
     private String value;
 
     /**
-     * Get the name value.
+     * Get the run command parameter name.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the run command parameter name.
      *
      * @param name the name value to set
      * @return the RunCommandInputParameter object itself.
@@ -47,7 +47,7 @@ public RunCommandInputParameter withName(String name) {
     }
 
     /**
-     * Get the value value.
+     * Get the run command parameter value.
      *
      * @return the value value
      */
@@ -56,7 +56,7 @@ public String value() {
     }
 
     /**
-     * Set the value value.
+     * Set the run command parameter value.
      *
      * @param value the value value to set
      * @return the RunCommandInputParameter object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandParameterDefinition.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandParameterDefinition.java
index 1711eb5293dc..6350b1cee85d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandParameterDefinition.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/RunCommandParameterDefinition.java
@@ -39,7 +39,7 @@ public class RunCommandParameterDefinition {
     private Boolean required;
 
     /**
-     * Get the name value.
+     * Get the run command parameter name.
      *
      * @return the name value
      */
@@ -48,7 +48,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the run command parameter name.
      *
      * @param name the name value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -59,7 +59,7 @@ public RunCommandParameterDefinition withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get the run command parameter type.
      *
      * @return the type value
      */
@@ -68,7 +68,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the run command parameter type.
      *
      * @param type the type value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -79,7 +79,7 @@ public RunCommandParameterDefinition withType(String type) {
     }
 
     /**
-     * Get the defaultValue value.
+     * Get the run command parameter default value.
      *
      * @return the defaultValue value
      */
@@ -88,7 +88,7 @@ public String defaultValue() {
     }
 
     /**
-     * Set the defaultValue value.
+     * Set the run command parameter default value.
      *
      * @param defaultValue the defaultValue value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -99,7 +99,7 @@ public RunCommandParameterDefinition withDefaultValue(String defaultValue) {
     }
 
     /**
-     * Get the required value.
+     * Get the run command parameter required.
      *
      * @return the required value
      */
@@ -108,7 +108,7 @@ public Boolean required() {
     }
 
     /**
-     * Set the required value.
+     * Set the run command parameter required.
      *
      * @param required the required value to set
      * @return the RunCommandParameterDefinition object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Sku.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Sku.java
index a94edb20745b..8ad09e535d11 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Sku.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Sku.java
@@ -35,7 +35,7 @@ public class Sku {
     private Long capacity;
 
     /**
-     * Get the name value.
+     * Get the sku name.
      *
      * @return the name value
      */
@@ -44,7 +44,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the sku name.
      *
      * @param name the name value to set
      * @return the Sku object itself.
@@ -55,7 +55,7 @@ public Sku withName(String name) {
     }
 
     /**
-     * Get the tier value.
+     * Get specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @return the tier value
      */
@@ -64,7 +64,7 @@ public String tier() {
     }
 
     /**
-     * Set the tier value.
+     * Set specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @param tier the tier value to set
      * @return the Sku object itself.
@@ -75,7 +75,7 @@ public Sku withTier(String tier) {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
@@ -84,7 +84,7 @@ public Long capacity() {
     }
 
     /**
-     * Set the capacity value.
+     * Set specifies the number of virtual machines in the scale set.
      *
      * @param capacity the capacity value to set
      * @return the Sku object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Snapshot.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Snapshot.java
index aca022decb70..ada08543748e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Snapshot.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/Snapshot.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import org.joda.time.DateTime;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SnapshotUpdate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SnapshotUpdate.java
index e0fafe2ff0dc..e26100dcfa05 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SnapshotUpdate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SnapshotUpdate.java
@@ -39,7 +39,7 @@ public class SnapshotUpdate extends ResourceUpdate {
     private EncryptionSettings encryptionSettings;
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -48,7 +48,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the SnapshotUpdate object itself.
@@ -59,7 +59,7 @@ public SnapshotUpdate withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -68,7 +68,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the SnapshotUpdate object itself.
@@ -79,7 +79,7 @@ public SnapshotUpdate withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -88,7 +88,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the SnapshotUpdate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SourceVault.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SourceVault.java
index a986c547f2cb..59a3c406fea1 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SourceVault.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SourceVault.java
@@ -22,7 +22,7 @@ public class SourceVault {
     private String id;
 
     /**
-     * Get the id value.
+     * Get resource Id.
      *
      * @return the id value
      */
@@ -31,7 +31,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set resource Id.
      *
      * @param id the id value to set
      * @return the SourceVault object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshConfiguration.java
index 5500612cbd17..13fef512da9e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshConfiguration.java
@@ -22,7 +22,7 @@ public class SshConfiguration {
     private List<SshPublicKey> publicKeys;
 
     /**
-     * Get the publicKeys value.
+     * Get the list of SSH public keys used to authenticate with linux based VMs.
      *
      * @return the publicKeys value
      */
@@ -31,7 +31,7 @@ public List<SshPublicKey> publicKeys() {
     }
 
     /**
-     * Set the publicKeys value.
+     * Set the list of SSH public keys used to authenticate with linux based VMs.
      *
      * @param publicKeys the publicKeys value to set
      * @return the SshConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshPublicKey.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshPublicKey.java
index 9a19cf4a6a4e..8403b23ff362 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshPublicKey.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SshPublicKey.java
@@ -34,7 +34,7 @@ public class SshPublicKey {
     private String keyData;
 
     /**
-     * Get the path value.
+     * Get specifies the full path on the created VM where ssh public key is stored. If the file already exists, the specified key is appended to the file. Example: /home/user/.ssh/authorized_keys.
      *
      * @return the path value
      */
@@ -43,7 +43,7 @@ public String path() {
     }
 
     /**
-     * Set the path value.
+     * Set specifies the full path on the created VM where ssh public key is stored. If the file already exists, the specified key is appended to the file. Example: /home/user/.ssh/authorized_keys.
      *
      * @param path the path value to set
      * @return the SshPublicKey object itself.
@@ -54,7 +54,7 @@ public SshPublicKey withPath(String path) {
     }
 
     /**
-     * Get the keyData value.
+     * Get sSH public key certificate used to authenticate with the VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa format. &lt;br&gt;&lt;br&gt; For creating ssh keys, see [Create SSH keys on Linux and Mac for Linux VMs in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the keyData value
      */
@@ -63,7 +63,7 @@ public String keyData() {
     }
 
     /**
-     * Set the keyData value.
+     * Set sSH public key certificate used to authenticate with the VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa format. &lt;br&gt;&lt;br&gt; For creating ssh keys, see [Create SSH keys on Linux and Mac for Linux VMs in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param keyData the keyData value to set
      * @return the SshPublicKey object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/StorageProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/StorageProfile.java
index 5088b39b1052..317ed97bfd89 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/StorageProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/StorageProfile.java
@@ -44,7 +44,7 @@ public class StorageProfile {
     private List<DataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @return the imageReference value
      */
@@ -53,7 +53,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @param imageReference the imageReference value to set
      * @return the StorageProfile object itself.
@@ -64,7 +64,7 @@ public StorageProfile withImageReference(ImageReference imageReference) {
     }
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -73,7 +73,7 @@ public OSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the StorageProfile object itself.
@@ -84,7 +84,7 @@ public StorageProfile withOsDisk(OSDisk osDisk) {
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -93,7 +93,7 @@ public List<DataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the StorageProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SubResourceReadOnly.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SubResourceReadOnly.java
index 53c471d8e135..63a43cc15d2e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SubResourceReadOnly.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/SubResourceReadOnly.java
@@ -21,7 +21,7 @@ public class SubResourceReadOnly {
     private String id;
 
     /**
-     * Get the id value.
+     * Get resource Id.
      *
      * @return the id value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpdateResource.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpdateResource.java
index c5919545149e..e9f4043a50b1 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpdateResource.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpdateResource.java
@@ -22,7 +22,7 @@ public class UpdateResource {
     private Map<String, String> tags;
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -31,7 +31,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the UpdateResource object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpgradePolicy.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpgradePolicy.java
index 6903abef7b6d..c3bf249b9dd2 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpgradePolicy.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UpgradePolicy.java
@@ -41,7 +41,7 @@ public class UpgradePolicy {
     private Boolean automaticOSUpgrade;
 
     /**
-     * Get the mode value.
+     * Get specifies the mode of an upgrade to virtual machines in the scale set.&lt;br /&gt;&lt;br /&gt; Possible values are:&lt;br /&gt;&lt;br /&gt; **Manual** - You  control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action.&lt;br /&gt;&lt;br /&gt; **Automatic** - All virtual machines in the scale set are  automatically updated at the same time. Possible values include: 'Automatic', 'Manual', 'Rolling'.
      *
      * @return the mode value
      */
@@ -50,7 +50,7 @@ public UpgradeMode mode() {
     }
 
     /**
-     * Set the mode value.
+     * Set specifies the mode of an upgrade to virtual machines in the scale set.&lt;br /&gt;&lt;br /&gt; Possible values are:&lt;br /&gt;&lt;br /&gt; **Manual** - You  control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action.&lt;br /&gt;&lt;br /&gt; **Automatic** - All virtual machines in the scale set are  automatically updated at the same time. Possible values include: 'Automatic', 'Manual', 'Rolling'.
      *
      * @param mode the mode value to set
      * @return the UpgradePolicy object itself.
@@ -61,7 +61,7 @@ public UpgradePolicy withMode(UpgradeMode mode) {
     }
 
     /**
-     * Get the rollingUpgradePolicy value.
+     * Get the configuration parameters used while performing a rolling upgrade.
      *
      * @return the rollingUpgradePolicy value
      */
@@ -70,7 +70,7 @@ public RollingUpgradePolicy rollingUpgradePolicy() {
     }
 
     /**
-     * Set the rollingUpgradePolicy value.
+     * Set the configuration parameters used while performing a rolling upgrade.
      *
      * @param rollingUpgradePolicy the rollingUpgradePolicy value to set
      * @return the UpgradePolicy object itself.
@@ -81,7 +81,7 @@ public UpgradePolicy withRollingUpgradePolicy(RollingUpgradePolicy rollingUpgrad
     }
 
     /**
-     * Get the automaticOSUpgrade value.
+     * Get whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available.
      *
      * @return the automaticOSUpgrade value
      */
@@ -90,7 +90,7 @@ public Boolean automaticOSUpgrade() {
     }
 
     /**
-     * Set the automaticOSUpgrade value.
+     * Set whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available.
      *
      * @param automaticOSUpgrade the automaticOSUpgrade value to set
      * @return the UpgradePolicy object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UsageName.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UsageName.java
index d8cf6a1090f9..a2ea0c4b325d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UsageName.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/UsageName.java
@@ -27,7 +27,7 @@ public class UsageName {
     private String localizedValue;
 
     /**
-     * Get the value value.
+     * Get the name of the resource.
      *
      * @return the value value
      */
@@ -36,7 +36,7 @@ public String value() {
     }
 
     /**
-     * Set the value value.
+     * Set the name of the resource.
      *
      * @param value the value value to set
      * @return the UsageName object itself.
@@ -47,7 +47,7 @@ public UsageName withValue(String value) {
     }
 
     /**
-     * Get the localizedValue value.
+     * Get the localized name of the resource.
      *
      * @return the localizedValue value
      */
@@ -56,7 +56,7 @@ public String localizedValue() {
     }
 
     /**
-     * Set the localizedValue value.
+     * Set the localized name of the resource.
      *
      * @param localizedValue the localizedValue value to set
      * @return the UsageName object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultCertificate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultCertificate.java
index aee1b904c265..b828dbd54618 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultCertificate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultCertificate.java
@@ -43,7 +43,7 @@ public class VaultCertificate {
     private String certificateStore;
 
     /**
-     * Get the certificateUrl value.
+     * Get this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @return the certificateUrl value
      */
@@ -52,7 +52,7 @@ public String certificateUrl() {
     }
 
     /**
-     * Set the certificateUrl value.
+     * Set this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @param certificateUrl the certificateUrl value to set
      * @return the VaultCertificate object itself.
@@ -63,7 +63,7 @@ public VaultCertificate withCertificateUrl(String certificateUrl) {
     }
 
     /**
-     * Get the certificateStore value.
+     * Get for Windows VMs, specifies the certificate store on the Virtual Machine to which the certificate should be added. The specified certificate store is implicitly in the LocalMachine account. &lt;br&gt;&lt;br&gt;For Linux VMs, the certificate file is placed under the /var/lib/waagent directory, with the file name &lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and &lt;UppercaseThumbpring&gt;.prv for private key. Both of these files are .pem formatted.
      *
      * @return the certificateStore value
      */
@@ -72,7 +72,7 @@ public String certificateStore() {
     }
 
     /**
-     * Set the certificateStore value.
+     * Set for Windows VMs, specifies the certificate store on the Virtual Machine to which the certificate should be added. The specified certificate store is implicitly in the LocalMachine account. &lt;br&gt;&lt;br&gt;For Linux VMs, the certificate file is placed under the /var/lib/waagent directory, with the file name &lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and &lt;UppercaseThumbpring&gt;.prv for private key. Both of these files are .pem formatted.
      *
      * @param certificateStore the certificateStore value to set
      * @return the VaultCertificate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultSecretGroup.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultSecretGroup.java
index bd49bb51e892..fa0bd460d405 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultSecretGroup.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VaultSecretGroup.java
@@ -31,7 +31,7 @@ public class VaultSecretGroup {
     private List<VaultCertificate> vaultCertificates;
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing all of the certificates in VaultCertificates.
      *
      * @return the sourceVault value
      */
@@ -40,7 +40,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing all of the certificates in VaultCertificates.
      *
      * @param sourceVault the sourceVault value to set
      * @return the VaultSecretGroup object itself.
@@ -51,7 +51,7 @@ public VaultSecretGroup withSourceVault(SubResource sourceVault) {
     }
 
     /**
-     * Get the vaultCertificates value.
+     * Get the list of key vault references in SourceVault which contain certificates.
      *
      * @return the vaultCertificates value
      */
@@ -60,7 +60,7 @@ public List<VaultCertificate> vaultCertificates() {
     }
 
     /**
-     * Set the vaultCertificates value.
+     * Set the list of key vault references in SourceVault which contain certificates.
      *
      * @param vaultCertificates the vaultCertificates value to set
      * @return the VaultSecretGroup object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualHardDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualHardDisk.java
index ddb676c0a4e1..5deb37042249 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualHardDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualHardDisk.java
@@ -21,7 +21,7 @@ public class VirtualHardDisk {
     private String uri;
 
     /**
-     * Get the uri value.
+     * Get specifies the virtual hard disk's uri.
      *
      * @return the uri value
      */
@@ -30,7 +30,7 @@ public String uri() {
     }
 
     /**
-     * Set the uri value.
+     * Set specifies the virtual hard disk's uri.
      *
      * @param uri the uri value to set
      * @return the VirtualHardDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachine.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachine.java
index 0770d63ab310..d91d3c66f51c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachine.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachine.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import com.microsoft.azure.SubResource;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineAgentInstanceView.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineAgentInstanceView.java
index d8bf79451139..78ee1890f6cd 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineAgentInstanceView.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineAgentInstanceView.java
@@ -34,7 +34,7 @@ public class VirtualMachineAgentInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the vmAgentVersion value.
+     * Get the VM Agent full version.
      *
      * @return the vmAgentVersion value
      */
@@ -43,7 +43,7 @@ public String vmAgentVersion() {
     }
 
     /**
-     * Set the vmAgentVersion value.
+     * Set the VM Agent full version.
      *
      * @param vmAgentVersion the vmAgentVersion value to set
      * @return the VirtualMachineAgentInstanceView object itself.
@@ -54,7 +54,7 @@ public VirtualMachineAgentInstanceView withVmAgentVersion(String vmAgentVersion)
     }
 
     /**
-     * Get the extensionHandlers value.
+     * Get the virtual machine extension handler instance view.
      *
      * @return the extensionHandlers value
      */
@@ -63,7 +63,7 @@ public List<VirtualMachineExtensionHandlerInstanceView> extensionHandlers() {
     }
 
     /**
-     * Set the extensionHandlers value.
+     * Set the virtual machine extension handler instance view.
      *
      * @param extensionHandlers the extensionHandlers value to set
      * @return the VirtualMachineAgentInstanceView object itself.
@@ -74,7 +74,7 @@ public VirtualMachineAgentInstanceView withExtensionHandlers(List<VirtualMachine
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -83,7 +83,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineAgentInstanceView object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineCaptureParameters.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineCaptureParameters.java
index ba2f0c42d561..1af6578db435 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineCaptureParameters.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineCaptureParameters.java
@@ -34,7 +34,7 @@ public class VirtualMachineCaptureParameters {
     private boolean overwriteVhds;
 
     /**
-     * Get the vhdPrefix value.
+     * Get the captured virtual hard disk's name prefix.
      *
      * @return the vhdPrefix value
      */
@@ -43,7 +43,7 @@ public String vhdPrefix() {
     }
 
     /**
-     * Set the vhdPrefix value.
+     * Set the captured virtual hard disk's name prefix.
      *
      * @param vhdPrefix the vhdPrefix value to set
      * @return the VirtualMachineCaptureParameters object itself.
@@ -54,7 +54,7 @@ public VirtualMachineCaptureParameters withVhdPrefix(String vhdPrefix) {
     }
 
     /**
-     * Get the destinationContainerName value.
+     * Get the destination container name.
      *
      * @return the destinationContainerName value
      */
@@ -63,7 +63,7 @@ public String destinationContainerName() {
     }
 
     /**
-     * Set the destinationContainerName value.
+     * Set the destination container name.
      *
      * @param destinationContainerName the destinationContainerName value to set
      * @return the VirtualMachineCaptureParameters object itself.
@@ -74,7 +74,7 @@ public VirtualMachineCaptureParameters withDestinationContainerName(String desti
     }
 
     /**
-     * Get the overwriteVhds value.
+     * Get specifies whether to overwrite the destination virtual hard disk, in case of conflict.
      *
      * @return the overwriteVhds value
      */
@@ -83,7 +83,7 @@ public boolean overwriteVhds() {
     }
 
     /**
-     * Set the overwriteVhds value.
+     * Set specifies whether to overwrite the destination virtual hard disk, in case of conflict.
      *
      * @param overwriteVhds the overwriteVhds value to set
      * @return the VirtualMachineCaptureParameters object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionHandlerInstanceView.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionHandlerInstanceView.java
index 6c39edef66b9..a09d26e3547d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionHandlerInstanceView.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionHandlerInstanceView.java
@@ -34,7 +34,7 @@ public class VirtualMachineExtensionHandlerInstanceView {
     private InstanceViewStatus status;
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -43,7 +43,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
@@ -54,7 +54,7 @@ public VirtualMachineExtensionHandlerInstanceView withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -63,7 +63,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
@@ -74,7 +74,7 @@ public VirtualMachineExtensionHandlerInstanceView withTypeHandlerVersion(String
     }
 
     /**
-     * Get the status value.
+     * Get the extension handler status.
      *
      * @return the status value
      */
@@ -83,7 +83,7 @@ public InstanceViewStatus status() {
     }
 
     /**
-     * Set the status value.
+     * Set the extension handler status.
      *
      * @param status the status value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionInstanceView.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionInstanceView.java
index 2d896b3f1825..bd6c9b1e9e08 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionInstanceView.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionInstanceView.java
@@ -47,7 +47,7 @@ public class VirtualMachineExtensionInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the name value.
+     * Get the virtual machine extension name.
      *
      * @return the name value
      */
@@ -56,7 +56,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the virtual machine extension name.
      *
      * @param name the name value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -67,7 +67,7 @@ public VirtualMachineExtensionInstanceView withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -76,7 +76,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -87,7 +87,7 @@ public VirtualMachineExtensionInstanceView withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -96,7 +96,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -107,7 +107,7 @@ public VirtualMachineExtensionInstanceView withTypeHandlerVersion(String typeHan
     }
 
     /**
-     * Get the substatuses value.
+     * Get the resource status information.
      *
      * @return the substatuses value
      */
@@ -116,7 +116,7 @@ public List<InstanceViewStatus> substatuses() {
     }
 
     /**
-     * Set the substatuses value.
+     * Set the resource status information.
      *
      * @param substatuses the substatuses value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -127,7 +127,7 @@ public VirtualMachineExtensionInstanceView withSubstatuses(List<InstanceViewStat
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -136,7 +136,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionUpdate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionUpdate.java
index ec2d13b4844e..c276d1b46878 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionUpdate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensionUpdate.java
@@ -65,7 +65,7 @@ public class VirtualMachineExtensionUpdate extends UpdateResource {
     private Object protectedSettings;
 
     /**
-     * Get the forceUpdateTag value.
+     * Get how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -74,7 +74,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -85,7 +85,7 @@ public VirtualMachineExtensionUpdate withForceUpdateTag(String forceUpdateTag) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -94,7 +94,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -105,7 +105,7 @@ public VirtualMachineExtensionUpdate withPublisher(String publisher) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -114,7 +114,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -125,7 +125,7 @@ public VirtualMachineExtensionUpdate withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -134,7 +134,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -145,7 +145,7 @@ public VirtualMachineExtensionUpdate withTypeHandlerVersion(String typeHandlerVe
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -154,7 +154,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -165,7 +165,7 @@ public VirtualMachineExtensionUpdate withAutoUpgradeMinorVersion(Boolean autoUpg
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -174,7 +174,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -185,7 +185,7 @@ public VirtualMachineExtensionUpdate withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -194,7 +194,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineExtensionUpdate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineHealthStatus.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineHealthStatus.java
index f098d277ffb2..696121a81101 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineHealthStatus.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineHealthStatus.java
@@ -21,7 +21,7 @@ public class VirtualMachineHealthStatus {
     private InstanceViewStatus status;
 
     /**
-     * Get the status value.
+     * Get the health status information for the VM.
      *
      * @return the status value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineIdentity.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineIdentity.java
index c5380e8104fb..ad6a722abc34 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineIdentity.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineIdentity.java
@@ -35,7 +35,7 @@ public class VirtualMachineIdentity {
     private ResourceIdentityType type;
 
     /**
-     * Get the principalId value.
+     * Get the principal id of virtual machine identity.
      *
      * @return the principalId value
      */
@@ -44,7 +44,7 @@ public String principalId() {
     }
 
     /**
-     * Get the tenantId value.
+     * Get the tenant id associated with the virtual machine.
      *
      * @return the tenantId value
      */
@@ -53,7 +53,7 @@ public String tenantId() {
     }
 
     /**
-     * Get the type value.
+     * Get the type of identity used for the virtual machine. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity. Possible values include: 'SystemAssigned'.
      *
      * @return the type value
      */
@@ -62,7 +62,7 @@ public ResourceIdentityType type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of identity used for the virtual machine. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity. Possible values include: 'SystemAssigned'.
      *
      * @param type the type value to set
      * @return the VirtualMachineIdentity object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSet.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSet.java
index 8646817be637..73b71577485a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSet.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSet.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetDataDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetDataDisk.java
index ad911fa4b36f..d5a9a2fcb84a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetDataDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetDataDisk.java
@@ -47,7 +47,7 @@ public class VirtualMachineScaleSetDataDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -60,7 +60,7 @@ public class VirtualMachineScaleSetDataDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -69,7 +69,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -80,7 +80,7 @@ public VirtualMachineScaleSetDataDisk withName(String name) {
     }
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -89,7 +89,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetDataDisk withLun(int lun) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -109,7 +109,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -120,7 +120,7 @@ public VirtualMachineScaleSetDataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the createOption value.
+     * Get the create option. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -129,7 +129,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set the create option. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetDataDisk withCreateOption(DiskCreateOptionTypes cre
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -149,7 +149,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -160,7 +160,7 @@ public VirtualMachineScaleSetDataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -169,7 +169,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetExtensionProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetExtensionProfile.java
index f03a52fb1237..14e5db1a4417 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetExtensionProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetExtensionProfile.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetExtensionProfile {
     private List<VirtualMachineScaleSetExtensionInner> extensions;
 
     /**
-     * Get the extensions value.
+     * Get the virtual machine scale set child extension resources.
      *
      * @return the extensions value
      */
@@ -32,7 +32,7 @@ public List<VirtualMachineScaleSetExtensionInner> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the virtual machine scale set child extension resources.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineScaleSetExtensionProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIPConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIPConfiguration.java
index 8bc4d767e9a2..6e7ea749416c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIPConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIPConfiguration.java
@@ -80,7 +80,7 @@ public class VirtualMachineScaleSetIPConfiguration extends SubResource {
     private List<SubResource> loadBalancerInboundNatPools;
 
     /**
-     * Get the name value.
+     * Get the IP configuration name.
      *
      * @return the name value
      */
@@ -89,7 +89,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the IP configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetIPConfiguration withName(String name) {
     }
 
     /**
-     * Get the subnet value.
+     * Get specifies the identifier of the subnet.
      *
      * @return the subnet value
      */
@@ -109,7 +109,7 @@ public ApiEntityReference subnet() {
     }
 
     /**
-     * Set the subnet value.
+     * Set specifies the identifier of the subnet.
      *
      * @param subnet the subnet value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -120,7 +120,7 @@ public VirtualMachineScaleSetIPConfiguration withSubnet(ApiEntityReference subne
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -129,7 +129,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetIPConfiguration withPrimary(Boolean primary) {
     }
 
     /**
-     * Get the publicIPAddressConfiguration value.
+     * Get the publicIPAddressConfiguration.
      *
      * @return the publicIPAddressConfiguration value
      */
@@ -149,7 +149,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration publicIPAddressConfigu
     }
 
     /**
-     * Set the publicIPAddressConfiguration value.
+     * Set the publicIPAddressConfiguration.
      *
      * @param publicIPAddressConfiguration the publicIPAddressConfiguration value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -160,7 +160,7 @@ public VirtualMachineScaleSetIPConfiguration withPublicIPAddressConfiguration(Vi
     }
 
     /**
-     * Get the privateIPAddressVersion value.
+     * Get available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @return the privateIPAddressVersion value
      */
@@ -169,7 +169,7 @@ public IPVersion privateIPAddressVersion() {
     }
 
     /**
-     * Set the privateIPAddressVersion value.
+     * Set available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @param privateIPAddressVersion the privateIPAddressVersion value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -180,7 +180,7 @@ public VirtualMachineScaleSetIPConfiguration withPrivateIPAddressVersion(IPVersi
     }
 
     /**
-     * Get the applicationGatewayBackendAddressPools value.
+     * Get specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets cannot use the same application gateway.
      *
      * @return the applicationGatewayBackendAddressPools value
      */
@@ -189,7 +189,7 @@ public List<SubResource> applicationGatewayBackendAddressPools() {
     }
 
     /**
-     * Set the applicationGatewayBackendAddressPools value.
+     * Set specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets cannot use the same application gateway.
      *
      * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -200,7 +200,7 @@ public VirtualMachineScaleSetIPConfiguration withApplicationGatewayBackendAddres
     }
 
     /**
-     * Get the loadBalancerBackendAddressPools value.
+     * Get specifies an array of references to backend address pools of load balancers. A scale set can reference backend address pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @return the loadBalancerBackendAddressPools value
      */
@@ -209,7 +209,7 @@ public List<SubResource> loadBalancerBackendAddressPools() {
     }
 
     /**
-     * Set the loadBalancerBackendAddressPools value.
+     * Set specifies an array of references to backend address pools of load balancers. A scale set can reference backend address pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -220,7 +220,7 @@ public VirtualMachineScaleSetIPConfiguration withLoadBalancerBackendAddressPools
     }
 
     /**
-     * Get the loadBalancerInboundNatPools value.
+     * Get specifies an array of references to inbound Nat pools of the load balancers. A scale set can reference inbound nat pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @return the loadBalancerInboundNatPools value
      */
@@ -229,7 +229,7 @@ public List<SubResource> loadBalancerInboundNatPools() {
     }
 
     /**
-     * Set the loadBalancerInboundNatPools value.
+     * Set specifies an array of references to inbound Nat pools of the load balancers. A scale set can reference inbound nat pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @param loadBalancerInboundNatPools the loadBalancerInboundNatPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIdentity.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIdentity.java
index 5ebc09958dfc..ae09f4edaaf5 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIdentity.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetIdentity.java
@@ -35,7 +35,7 @@ public class VirtualMachineScaleSetIdentity {
     private ResourceIdentityType type;
 
     /**
-     * Get the principalId value.
+     * Get the principal id of virtual machine scale set identity.
      *
      * @return the principalId value
      */
@@ -44,7 +44,7 @@ public String principalId() {
     }
 
     /**
-     * Get the tenantId value.
+     * Get the tenant id associated with the virtual machine scale set.
      *
      * @return the tenantId value
      */
@@ -53,7 +53,7 @@ public String tenantId() {
     }
 
     /**
-     * Get the type value.
+     * Get the type of identity used for the virtual machine scale set. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity. Possible values include: 'SystemAssigned'.
      *
      * @return the type value
      */
@@ -62,7 +62,7 @@ public ResourceIdentityType type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of identity used for the virtual machine scale set. Currently, the only supported type is 'SystemAssigned', which implicitly creates an identity. Possible values include: 'SystemAssigned'.
      *
      * @param type the type value to set
      * @return the VirtualMachineScaleSetIdentity object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetInstanceViewStatusesSummary.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetInstanceViewStatusesSummary.java
index 19a2deb31243..31451f479196 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetInstanceViewStatusesSummary.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetInstanceViewStatusesSummary.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetInstanceViewStatusesSummary {
     private List<VirtualMachineStatusCodeCount> statusesSummary;
 
     /**
-     * Get the statusesSummary value.
+     * Get the extensions information.
      *
      * @return the statusesSummary value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetManagedDiskParameters.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetManagedDiskParameters.java
index 27d2323dd58e..6246f1597bdf 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetManagedDiskParameters.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetManagedDiskParameters.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetManagedDiskParameters {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -32,7 +32,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the VirtualMachineScaleSetManagedDiskParameters object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfiguration.java
index fe734f6dd5fb..6295cf0a9a97 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfiguration.java
@@ -58,7 +58,7 @@ public class VirtualMachineScaleSetNetworkConfiguration extends SubResource {
     private List<VirtualMachineScaleSetIPConfiguration> ipConfigurations;
 
     /**
-     * Get the name value.
+     * Get the network configuration name.
      *
      * @return the name value
      */
@@ -67,7 +67,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the network configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -78,7 +78,7 @@ public VirtualMachineScaleSetNetworkConfiguration withName(String name) {
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -87,7 +87,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -98,7 +98,7 @@ public VirtualMachineScaleSetNetworkConfiguration withPrimary(Boolean primary) {
     }
 
     /**
-     * Get the enableAcceleratedNetworking value.
+     * Get specifies whether the network interface is accelerated networking-enabled.
      *
      * @return the enableAcceleratedNetworking value
      */
@@ -107,7 +107,7 @@ public Boolean enableAcceleratedNetworking() {
     }
 
     /**
-     * Set the enableAcceleratedNetworking value.
+     * Set specifies whether the network interface is accelerated networking-enabled.
      *
      * @param enableAcceleratedNetworking the enableAcceleratedNetworking value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -118,7 +118,7 @@ public VirtualMachineScaleSetNetworkConfiguration withEnableAcceleratedNetworkin
     }
 
     /**
-     * Get the networkSecurityGroup value.
+     * Get the network security group.
      *
      * @return the networkSecurityGroup value
      */
@@ -127,7 +127,7 @@ public SubResource networkSecurityGroup() {
     }
 
     /**
-     * Set the networkSecurityGroup value.
+     * Set the network security group.
      *
      * @param networkSecurityGroup the networkSecurityGroup value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -138,7 +138,7 @@ public VirtualMachineScaleSetNetworkConfiguration withNetworkSecurityGroup(SubRe
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the network interfaces.
      *
      * @return the dnsSettings value
      */
@@ -147,7 +147,7 @@ public VirtualMachineScaleSetNetworkConfigurationDnsSettings dnsSettings() {
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the network interfaces.
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -158,7 +158,7 @@ public VirtualMachineScaleSetNetworkConfiguration withDnsSettings(VirtualMachine
     }
 
     /**
-     * Get the ipConfigurations value.
+     * Get specifies the IP configurations of the network interface.
      *
      * @return the ipConfigurations value
      */
@@ -167,7 +167,7 @@ public List<VirtualMachineScaleSetIPConfiguration> ipConfigurations() {
     }
 
     /**
-     * Set the ipConfigurations value.
+     * Set specifies the IP configurations of the network interface.
      *
      * @param ipConfigurations the ipConfigurations value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
index f6e7280b2a73..dd1a4f7e809b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetNetworkConfigurationDnsSettings {
     private List<String> dnsServers;
 
     /**
-     * Get the dnsServers value.
+     * Get list of DNS servers IP addresses.
      *
      * @return the dnsServers value
      */
@@ -32,7 +32,7 @@ public List<String> dnsServers() {
     }
 
     /**
-     * Set the dnsServers value.
+     * Set list of DNS servers IP addresses.
      *
      * @param dnsServers the dnsServers value to set
      * @return the VirtualMachineScaleSetNetworkConfigurationDnsSettings object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkProfile.java
index fe7f47e5cb3e..f34b7b4a976c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetNetworkProfile.java
@@ -31,7 +31,7 @@ public class VirtualMachineScaleSetNetworkProfile {
     private List<VirtualMachineScaleSetNetworkConfiguration> networkInterfaceConfigurations;
 
     /**
-     * Get the healthProbe value.
+     * Get a reference to a load balancer probe used to determine the health of an instance in the virtual machine scale set. The reference will be in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
      *
      * @return the healthProbe value
      */
@@ -40,7 +40,7 @@ public ApiEntityReference healthProbe() {
     }
 
     /**
-     * Set the healthProbe value.
+     * Set a reference to a load balancer probe used to determine the health of an instance in the virtual machine scale set. The reference will be in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
      *
      * @param healthProbe the healthProbe value to set
      * @return the VirtualMachineScaleSetNetworkProfile object itself.
@@ -51,7 +51,7 @@ public VirtualMachineScaleSetNetworkProfile withHealthProbe(ApiEntityReference h
     }
 
     /**
-     * Get the networkInterfaceConfigurations value.
+     * Get the list of network configurations.
      *
      * @return the networkInterfaceConfigurations value
      */
@@ -60,7 +60,7 @@ public List<VirtualMachineScaleSetNetworkConfiguration> networkInterfaceConfigur
     }
 
     /**
-     * Set the networkInterfaceConfigurations value.
+     * Set the list of network configurations.
      *
      * @param networkInterfaceConfigurations the networkInterfaceConfigurations value to set
      * @return the VirtualMachineScaleSetNetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSDisk.java
index 99cbc7e6c6c5..1e60eda23cd9 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSDisk.java
@@ -74,7 +74,7 @@ public class VirtualMachineScaleSetOSDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -83,7 +83,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -94,7 +94,7 @@ public VirtualMachineScaleSetOSDisk withName(String name) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -103,7 +103,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -114,7 +114,7 @@ public VirtualMachineScaleSetOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machines in the scale set should be created.&lt;br&gt;&lt;br&gt; The only allowed value is: **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -123,7 +123,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machines in the scale set should be created.&lt;br&gt;&lt;br&gt; The only allowed value is: **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -134,7 +134,7 @@ public VirtualMachineScaleSetOSDisk withCreateOption(DiskCreateOptionTypes creat
     }
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -143,7 +143,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -154,7 +154,7 @@ public VirtualMachineScaleSetOSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the image value.
+     * Get specifies information about the unmanaged user image to base the scale set on.
      *
      * @return the image value
      */
@@ -163,7 +163,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set specifies information about the unmanaged user image to base the scale set on.
      *
      * @param image the image value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -174,7 +174,7 @@ public VirtualMachineScaleSetOSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the vhdContainers value.
+     * Get specifies the container urls that are used to store operating system disks for the scale set.
      *
      * @return the vhdContainers value
      */
@@ -183,7 +183,7 @@ public List<String> vhdContainers() {
     }
 
     /**
-     * Set the vhdContainers value.
+     * Set specifies the container urls that are used to store operating system disks for the scale set.
      *
      * @param vhdContainers the vhdContainers value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -194,7 +194,7 @@ public VirtualMachineScaleSetOSDisk withVhdContainers(List<String> vhdContainers
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -203,7 +203,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSProfile.java
index 5f9f10acad30..8f6c27eed581 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetOSProfile.java
@@ -102,7 +102,7 @@ public class VirtualMachineScaleSetOSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the computerNamePrefix value.
+     * Get specifies the computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
      *
      * @return the computerNamePrefix value
      */
@@ -111,7 +111,7 @@ public String computerNamePrefix() {
     }
 
     /**
-     * Set the computerNamePrefix value.
+     * Set specifies the computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
      *
      * @param computerNamePrefix the computerNamePrefix value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -122,7 +122,7 @@ public VirtualMachineScaleSetOSProfile withComputerNamePrefix(String computerNam
     }
 
     /**
-     * Get the adminUsername value.
+     * Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the adminUsername value
      */
@@ -131,7 +131,7 @@ public String adminUsername() {
     }
 
     /**
-     * Set the adminUsername value.
+     * Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param adminUsername the adminUsername value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -142,7 +142,7 @@ public VirtualMachineScaleSetOSProfile withAdminUsername(String adminUsername) {
     }
 
     /**
-     * Get the adminPassword value.
+     * Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @return the adminPassword value
      */
@@ -151,7 +151,7 @@ public String adminPassword() {
     }
 
     /**
-     * Set the adminPassword value.
+     * Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @param adminPassword the adminPassword value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -162,7 +162,7 @@ public VirtualMachineScaleSetOSProfile withAdminPassword(String adminPassword) {
     }
 
     /**
-     * Get the customData value.
+     * Get specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the customData value
      */
@@ -171,7 +171,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param customData the customData value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -182,7 +182,7 @@ public VirtualMachineScaleSetOSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get specifies Windows operating system settings on the virtual machine.
      *
      * @return the windowsConfiguration value
      */
@@ -191,7 +191,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set specifies Windows operating system settings on the virtual machine.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -202,7 +202,7 @@ public VirtualMachineScaleSetOSProfile withWindowsConfiguration(WindowsConfigura
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the linuxConfiguration value
      */
@@ -211,7 +211,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -222,7 +222,7 @@ public VirtualMachineScaleSetOSProfile withLinuxConfiguration(LinuxConfiguration
     }
 
     /**
-     * Get the secrets value.
+     * Get specifies set of certificates that should be installed onto the virtual machines in the scale set.
      *
      * @return the secrets value
      */
@@ -231,7 +231,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set specifies set of certificates that should be installed onto the virtual machines in the scale set.
      *
      * @param secrets the secrets value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfiguration.java
index 02efe61bd311..a1e038b2e03b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfiguration.java
@@ -36,7 +36,7 @@ public class VirtualMachineScaleSetPublicIPAddressConfiguration {
     private VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings;
 
     /**
-     * Get the name value.
+     * Get the publicIP address configuration name.
      *
      * @return the name value
      */
@@ -45,7 +45,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the publicIP address configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
@@ -56,7 +56,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration withName(String name)
     }
 
     /**
-     * Get the idleTimeoutInMinutes value.
+     * Get the idle timeout of the public IP address.
      *
      * @return the idleTimeoutInMinutes value
      */
@@ -65,7 +65,7 @@ public Integer idleTimeoutInMinutes() {
     }
 
     /**
-     * Set the idleTimeoutInMinutes value.
+     * Set the idle timeout of the public IP address.
      *
      * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
@@ -76,7 +76,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration withIdleTimeoutInMinut
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the publicIP addresses .
      *
      * @return the dnsSettings value
      */
@@ -85,7 +85,7 @@ public VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the publicIP addresses .
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
index bfb9d9f31008..6305425cff74 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
@@ -24,7 +24,7 @@ public class VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings {
     private String domainNameLabel;
 
     /**
-     * Get the domainNameLabel value.
+     * Get the Domain name label.The concatenation of the domain name label and vm index will be the domain name labels of the PublicIPAddress resources that will be created.
      *
      * @return the domainNameLabel value
      */
@@ -33,7 +33,7 @@ public String domainNameLabel() {
     }
 
     /**
-     * Set the domainNameLabel value.
+     * Set the Domain name label.The concatenation of the domain name label and vm index will be the domain name labels of the PublicIPAddress resources that will be created.
      *
      * @param domainNameLabel the domainNameLabel value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetSkuCapacity.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetSkuCapacity.java
index a703e24737c3..89356071589b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetSkuCapacity.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetSkuCapacity.java
@@ -40,7 +40,7 @@ public class VirtualMachineScaleSetSkuCapacity {
     private VirtualMachineScaleSetSkuScaleType scaleType;
 
     /**
-     * Get the minimum value.
+     * Get the minimum capacity.
      *
      * @return the minimum value
      */
@@ -49,7 +49,7 @@ public Long minimum() {
     }
 
     /**
-     * Get the maximum value.
+     * Get the maximum capacity that can be set.
      *
      * @return the maximum value
      */
@@ -58,7 +58,7 @@ public Long maximum() {
     }
 
     /**
-     * Get the defaultCapacity value.
+     * Get the default capacity.
      *
      * @return the defaultCapacity value
      */
@@ -67,7 +67,7 @@ public Long defaultCapacity() {
     }
 
     /**
-     * Get the scaleType value.
+     * Get the scale type applicable to the sku. Possible values include: 'Automatic', 'None'.
      *
      * @return the scaleType value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetStorageProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetStorageProfile.java
index 01381bfa1f23..00851a9a0884 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetStorageProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetStorageProfile.java
@@ -44,7 +44,7 @@ public class VirtualMachineScaleSetStorageProfile {
     private List<VirtualMachineScaleSetDataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @return the imageReference value
      */
@@ -53,7 +53,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @param imageReference the imageReference value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
@@ -64,7 +64,7 @@ public VirtualMachineScaleSetStorageProfile withImageReference(ImageReference im
     }
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -73,7 +73,7 @@ public VirtualMachineScaleSetOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
@@ -84,7 +84,7 @@ public VirtualMachineScaleSetStorageProfile withOsDisk(VirtualMachineScaleSetOSD
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add data disks to the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -93,7 +93,7 @@ public List<VirtualMachineScaleSetDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add data disks to the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdate.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdate.java
index 2bb2de6343d2..d2653e650d45 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdate.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdate.java
@@ -62,7 +62,7 @@ public class VirtualMachineScaleSetUpdate extends UpdateResource {
     private VirtualMachineScaleSetIdentity identity;
 
     /**
-     * Get the sku value.
+     * Get the virtual machine scale set sku.
      *
      * @return the sku value
      */
@@ -71,7 +71,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the virtual machine scale set sku.
      *
      * @param sku the sku value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -82,7 +82,7 @@ public VirtualMachineScaleSetUpdate withSku(Sku sku) {
     }
 
     /**
-     * Get the plan value.
+     * Get the purchase plan when deploying a virtual machine scale set from VM Marketplace images.
      *
      * @return the plan value
      */
@@ -91,7 +91,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set the purchase plan when deploying a virtual machine scale set from VM Marketplace images.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -102,7 +102,7 @@ public VirtualMachineScaleSetUpdate withPlan(Plan plan) {
     }
 
     /**
-     * Get the upgradePolicy value.
+     * Get the upgrade policy.
      *
      * @return the upgradePolicy value
      */
@@ -111,7 +111,7 @@ public UpgradePolicy upgradePolicy() {
     }
 
     /**
-     * Set the upgradePolicy value.
+     * Set the upgrade policy.
      *
      * @param upgradePolicy the upgradePolicy value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -122,7 +122,7 @@ public VirtualMachineScaleSetUpdate withUpgradePolicy(UpgradePolicy upgradePolic
     }
 
     /**
-     * Get the virtualMachineProfile value.
+     * Get the virtual machine profile.
      *
      * @return the virtualMachineProfile value
      */
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateVMProfile virtualMachineProfile() {
     }
 
     /**
-     * Set the virtualMachineProfile value.
+     * Set the virtual machine profile.
      *
      * @param virtualMachineProfile the virtualMachineProfile value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -142,7 +142,7 @@ public VirtualMachineScaleSetUpdate withVirtualMachineProfile(VirtualMachineScal
     }
 
     /**
-     * Get the overprovision value.
+     * Get specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @return the overprovision value
      */
@@ -151,7 +151,7 @@ public Boolean overprovision() {
     }
 
     /**
-     * Set the overprovision value.
+     * Set specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @param overprovision the overprovision value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -162,7 +162,7 @@ public VirtualMachineScaleSetUpdate withOverprovision(Boolean overprovision) {
     }
 
     /**
-     * Get the singlePlacementGroup value.
+     * Get when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @return the singlePlacementGroup value
      */
@@ -171,7 +171,7 @@ public Boolean singlePlacementGroup() {
     }
 
     /**
-     * Set the singlePlacementGroup value.
+     * Set when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @param singlePlacementGroup the singlePlacementGroup value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -182,7 +182,7 @@ public VirtualMachineScaleSetUpdate withSinglePlacementGroup(Boolean singlePlace
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine scale set, if configured.
      *
      * @return the identity value
      */
@@ -191,7 +191,7 @@ public VirtualMachineScaleSetIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine scale set, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateIPConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateIPConfiguration.java
index a3ea6cde23b4..602525c6141b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateIPConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateIPConfiguration.java
@@ -71,7 +71,7 @@ public class VirtualMachineScaleSetUpdateIPConfiguration extends SubResource {
     private List<SubResource> loadBalancerInboundNatPools;
 
     /**
-     * Get the name value.
+     * Get the IP configuration name.
      *
      * @return the name value
      */
@@ -80,7 +80,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the IP configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -91,7 +91,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withName(String name) {
     }
 
     /**
-     * Get the subnet value.
+     * Get the subnet.
      *
      * @return the subnet value
      */
@@ -100,7 +100,7 @@ public ApiEntityReference subnet() {
     }
 
     /**
-     * Set the subnet value.
+     * Set the subnet.
      *
      * @param subnet the subnet value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -111,7 +111,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withSubnet(ApiEntityReference
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary IP Configuration in case the network interface has more than one IP Configuration.
      *
      * @return the primary value
      */
@@ -120,7 +120,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary IP Configuration in case the network interface has more than one IP Configuration.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPrimary(Boolean primary)
     }
 
     /**
-     * Get the publicIPAddressConfiguration value.
+     * Get the publicIPAddressConfiguration.
      *
      * @return the publicIPAddressConfiguration value
      */
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration publicIPAddressC
     }
 
     /**
-     * Set the publicIPAddressConfiguration value.
+     * Set the publicIPAddressConfiguration.
      *
      * @param publicIPAddressConfiguration the publicIPAddressConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -151,7 +151,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPublicIPAddressConfigurat
     }
 
     /**
-     * Get the privateIPAddressVersion value.
+     * Get available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @return the privateIPAddressVersion value
      */
@@ -160,7 +160,7 @@ public IPVersion privateIPAddressVersion() {
     }
 
     /**
-     * Set the privateIPAddressVersion value.
+     * Set available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @param privateIPAddressVersion the privateIPAddressVersion value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -171,7 +171,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPrivateIPAddressVersion(I
     }
 
     /**
-     * Get the applicationGatewayBackendAddressPools value.
+     * Get the application gateway backend address pools.
      *
      * @return the applicationGatewayBackendAddressPools value
      */
@@ -180,7 +180,7 @@ public List<SubResource> applicationGatewayBackendAddressPools() {
     }
 
     /**
-     * Set the applicationGatewayBackendAddressPools value.
+     * Set the application gateway backend address pools.
      *
      * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -191,7 +191,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withApplicationGatewayBackend
     }
 
     /**
-     * Get the loadBalancerBackendAddressPools value.
+     * Get the load balancer backend address pools.
      *
      * @return the loadBalancerBackendAddressPools value
      */
@@ -200,7 +200,7 @@ public List<SubResource> loadBalancerBackendAddressPools() {
     }
 
     /**
-     * Set the loadBalancerBackendAddressPools value.
+     * Set the load balancer backend address pools.
      *
      * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -211,7 +211,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withLoadBalancerBackendAddres
     }
 
     /**
-     * Get the loadBalancerInboundNatPools value.
+     * Get the load balancer inbound nat pools.
      *
      * @return the loadBalancerInboundNatPools value
      */
@@ -220,7 +220,7 @@ public List<SubResource> loadBalancerInboundNatPools() {
     }
 
     /**
-     * Set the loadBalancerInboundNatPools value.
+     * Set the load balancer inbound nat pools.
      *
      * @param loadBalancerInboundNatPools the loadBalancerInboundNatPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkConfiguration.java
index 062a820c549b..5494f9fba563 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkConfiguration.java
@@ -57,7 +57,7 @@ public class VirtualMachineScaleSetUpdateNetworkConfiguration extends SubResourc
     private List<VirtualMachineScaleSetUpdateIPConfiguration> ipConfigurations;
 
     /**
-     * Get the name value.
+     * Get the network configuration name.
      *
      * @return the name value
      */
@@ -66,7 +66,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the network configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -77,7 +77,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withName(String name) {
     }
 
     /**
-     * Get the primary value.
+     * Get whether this is a primary NIC on a virtual machine.
      *
      * @return the primary value
      */
@@ -86,7 +86,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set whether this is a primary NIC on a virtual machine.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -97,7 +97,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withPrimary(Boolean prim
     }
 
     /**
-     * Get the enableAcceleratedNetworking value.
+     * Get specifies whether the network interface is accelerated networking-enabled.
      *
      * @return the enableAcceleratedNetworking value
      */
@@ -106,7 +106,7 @@ public Boolean enableAcceleratedNetworking() {
     }
 
     /**
-     * Set the enableAcceleratedNetworking value.
+     * Set specifies whether the network interface is accelerated networking-enabled.
      *
      * @param enableAcceleratedNetworking the enableAcceleratedNetworking value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -117,7 +117,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withEnableAcceleratedNet
     }
 
     /**
-     * Get the networkSecurityGroup value.
+     * Get the network security group.
      *
      * @return the networkSecurityGroup value
      */
@@ -126,7 +126,7 @@ public SubResource networkSecurityGroup() {
     }
 
     /**
-     * Set the networkSecurityGroup value.
+     * Set the network security group.
      *
      * @param networkSecurityGroup the networkSecurityGroup value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -137,7 +137,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withNetworkSecurityGroup
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the network interfaces.
      *
      * @return the dnsSettings value
      */
@@ -146,7 +146,7 @@ public VirtualMachineScaleSetNetworkConfigurationDnsSettings dnsSettings() {
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the network interfaces.
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -157,7 +157,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withDnsSettings(VirtualM
     }
 
     /**
-     * Get the ipConfigurations value.
+     * Get the virtual machine scale set IP Configuration.
      *
      * @return the ipConfigurations value
      */
@@ -166,7 +166,7 @@ public List<VirtualMachineScaleSetUpdateIPConfiguration> ipConfigurations() {
     }
 
     /**
-     * Set the ipConfigurations value.
+     * Set the virtual machine scale set IP Configuration.
      *
      * @param ipConfigurations the ipConfigurations value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkProfile.java
index 8969ea3758d3..04d8b443cbff 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateNetworkProfile.java
@@ -22,7 +22,7 @@ public class VirtualMachineScaleSetUpdateNetworkProfile {
     private List<VirtualMachineScaleSetUpdateNetworkConfiguration> networkInterfaceConfigurations;
 
     /**
-     * Get the networkInterfaceConfigurations value.
+     * Get the list of network configurations.
      *
      * @return the networkInterfaceConfigurations value
      */
@@ -31,7 +31,7 @@ public List<VirtualMachineScaleSetUpdateNetworkConfiguration> networkInterfaceCo
     }
 
     /**
-     * Set the networkInterfaceConfigurations value.
+     * Set the list of network configurations.
      *
      * @param networkInterfaceConfigurations the networkInterfaceConfigurations value to set
      * @return the VirtualMachineScaleSetUpdateNetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSDisk.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSDisk.java
index bfb9fd3afdfe..7ac453037203 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSDisk.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSDisk.java
@@ -44,7 +44,7 @@ public class VirtualMachineScaleSetUpdateOSDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the caching value.
+     * Get the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -53,7 +53,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -64,7 +64,7 @@ public VirtualMachineScaleSetUpdateOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the image value.
+     * Get the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine. If SourceImage is provided, the destination VirtualHardDisk should not exist.
      *
      * @return the image value
      */
@@ -73,7 +73,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine. If SourceImage is provided, the destination VirtualHardDisk should not exist.
      *
      * @param image the image value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -84,7 +84,7 @@ public VirtualMachineScaleSetUpdateOSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the vhdContainers value.
+     * Get the list of virtual hard disk container uris.
      *
      * @return the vhdContainers value
      */
@@ -93,7 +93,7 @@ public List<String> vhdContainers() {
     }
 
     /**
-     * Set the vhdContainers value.
+     * Set the list of virtual hard disk container uris.
      *
      * @param vhdContainers the vhdContainers value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -104,7 +104,7 @@ public VirtualMachineScaleSetUpdateOSDisk withVhdContainers(List<String> vhdCont
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -113,7 +113,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSProfile.java
index c428e5000181..a2e89dfb8a01 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateOSProfile.java
@@ -40,7 +40,7 @@ public class VirtualMachineScaleSetUpdateOSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the customData value.
+     * Get a base-64 encoded string of custom data.
      *
      * @return the customData value
      */
@@ -49,7 +49,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set a base-64 encoded string of custom data.
      *
      * @param customData the customData value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -60,7 +60,7 @@ public VirtualMachineScaleSetUpdateOSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get the Windows Configuration of the OS profile.
      *
      * @return the windowsConfiguration value
      */
@@ -69,7 +69,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set the Windows Configuration of the OS profile.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -80,7 +80,7 @@ public VirtualMachineScaleSetUpdateOSProfile withWindowsConfiguration(WindowsCon
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get the Linux Configuration of the OS profile.
      *
      * @return the linuxConfiguration value
      */
@@ -89,7 +89,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set the Linux Configuration of the OS profile.
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetUpdateOSProfile withLinuxConfiguration(LinuxConfigu
     }
 
     /**
-     * Get the secrets value.
+     * Get the List of certificates for addition to the VM.
      *
      * @return the secrets value
      */
@@ -109,7 +109,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set the List of certificates for addition to the VM.
      *
      * @param secrets the secrets value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
index c2fbac0f5972..48ef0b65a38a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
@@ -36,7 +36,7 @@ public class VirtualMachineScaleSetUpdatePublicIPAddressConfiguration {
     private VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings;
 
     /**
-     * Get the name value.
+     * Get the publicIP address configuration name.
      *
      * @return the name value
      */
@@ -45,7 +45,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the publicIP address configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
@@ -56,7 +56,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration withName(String
     }
 
     /**
-     * Get the idleTimeoutInMinutes value.
+     * Get the idle timeout of the public IP address.
      *
      * @return the idleTimeoutInMinutes value
      */
@@ -65,7 +65,7 @@ public Integer idleTimeoutInMinutes() {
     }
 
     /**
-     * Set the idleTimeoutInMinutes value.
+     * Set the idle timeout of the public IP address.
      *
      * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
@@ -76,7 +76,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration withIdleTimeoutI
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the publicIP addresses .
      *
      * @return the dnsSettings value
      */
@@ -85,7 +85,7 @@ public VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the publicIP addresses .
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateStorageProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateStorageProfile.java
index 2e5f7eb0758d..3c3dc45cd785 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateStorageProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateStorageProfile.java
@@ -34,7 +34,7 @@ public class VirtualMachineScaleSetUpdateStorageProfile {
     private List<VirtualMachineScaleSetDataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get the image reference.
      *
      * @return the imageReference value
      */
@@ -43,7 +43,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set the image reference.
      *
      * @param imageReference the imageReference value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
@@ -54,7 +54,7 @@ public VirtualMachineScaleSetUpdateStorageProfile withImageReference(ImageRefere
     }
 
     /**
-     * Get the osDisk value.
+     * Get the OS disk.
      *
      * @return the osDisk value
      */
@@ -63,7 +63,7 @@ public VirtualMachineScaleSetUpdateOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set the OS disk.
      *
      * @param osDisk the osDisk value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
@@ -74,7 +74,7 @@ public VirtualMachineScaleSetUpdateStorageProfile withOsDisk(VirtualMachineScale
     }
 
     /**
-     * Get the dataDisks value.
+     * Get the data disks.
      *
      * @return the dataDisks value
      */
@@ -83,7 +83,7 @@ public List<VirtualMachineScaleSetDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set the data disks.
      *
      * @param dataDisks the dataDisks value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateVMProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateVMProfile.java
index bc9c120b8488..2d3c7b1f4683 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateVMProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetUpdateVMProfile.java
@@ -51,7 +51,7 @@ public class VirtualMachineScaleSetUpdateVMProfile {
     private String licenseType;
 
     /**
-     * Get the osProfile value.
+     * Get the virtual machine scale set OS profile.
      *
      * @return the osProfile value
      */
@@ -60,7 +60,7 @@ public VirtualMachineScaleSetUpdateOSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set the virtual machine scale set OS profile.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -71,7 +71,7 @@ public VirtualMachineScaleSetUpdateVMProfile withOsProfile(VirtualMachineScaleSe
     }
 
     /**
-     * Get the storageProfile value.
+     * Get the virtual machine scale set storage profile.
      *
      * @return the storageProfile value
      */
@@ -80,7 +80,7 @@ public VirtualMachineScaleSetUpdateStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set the virtual machine scale set storage profile.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -91,7 +91,7 @@ public VirtualMachineScaleSetUpdateVMProfile withStorageProfile(VirtualMachineSc
     }
 
     /**
-     * Get the networkProfile value.
+     * Get the virtual machine scale set network profile.
      *
      * @return the networkProfile value
      */
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetUpdateNetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set the virtual machine scale set network profile.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -111,7 +111,7 @@ public VirtualMachineScaleSetUpdateVMProfile withNetworkProfile(VirtualMachineSc
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get the virtual machine scale set diagnostics profile.
      *
      * @return the diagnosticsProfile value
      */
@@ -120,7 +120,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set the virtual machine scale set diagnostics profile.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateVMProfile withDiagnosticsProfile(DiagnosticsP
     }
 
     /**
-     * Get the extensionProfile value.
+     * Get the virtual machine scale set extension profile.
      *
      * @return the extensionProfile value
      */
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetExtensionProfile extensionProfile() {
     }
 
     /**
-     * Set the extensionProfile value.
+     * Set the virtual machine scale set extension profile.
      *
      * @param extensionProfile the extensionProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -151,7 +151,7 @@ public VirtualMachineScaleSetUpdateVMProfile withExtensionProfile(VirtualMachine
     }
 
     /**
-     * Get the licenseType value.
+     * Get the license type, which is for bring your own license scenario.
      *
      * @return the licenseType value
      */
@@ -160,7 +160,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set the license type, which is for bring your own license scenario.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVM.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVM.java
index b17368ac6c1a..30511a027f9e 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVM.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVM.java
@@ -50,7 +50,7 @@ public interface VirtualMachineScaleSetVM extends HasInner<VirtualMachineScaleSe
     /**
      * @return the instanceView value.
      */
-    VirtualMachineInstanceView instanceView();
+    VirtualMachineScaleSetVMInstanceView instanceView();
 
     /**
      * @return the latestModelApplied value.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMExtensionsSummary.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMExtensionsSummary.java
index c57a6f843db7..382d9bf576eb 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMExtensionsSummary.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMExtensionsSummary.java
@@ -28,7 +28,7 @@ public class VirtualMachineScaleSetVMExtensionsSummary {
     private List<VirtualMachineStatusCodeCount> statusesSummary;
 
     /**
-     * Get the name value.
+     * Get the extension name.
      *
      * @return the name value
      */
@@ -37,7 +37,7 @@ public String name() {
     }
 
     /**
-     * Get the statusesSummary value.
+     * Get the extensions information.
      *
      * @return the statusesSummary value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceIDs.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceIDs.java
index 8104a7594841..eb9fa8f69ddf 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceIDs.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceIDs.java
@@ -24,7 +24,7 @@ public class VirtualMachineScaleSetVMInstanceIDs {
     private List<String> instanceIds;
 
     /**
-     * Get the instanceIds value.
+     * Get the virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set.
      *
      * @return the instanceIds value
      */
@@ -33,7 +33,7 @@ public List<String> instanceIds() {
     }
 
     /**
-     * Set the instanceIds value.
+     * Set the virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set.
      *
      * @param instanceIds the instanceIds value to set
      * @return the VirtualMachineScaleSetVMInstanceIDs object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceRequiredIDs.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceRequiredIDs.java
index 38b558d40fed..82bdb8ac26d9 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceRequiredIDs.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMInstanceRequiredIDs.java
@@ -22,7 +22,7 @@ public class VirtualMachineScaleSetVMInstanceRequiredIDs {
     private List<String> instanceIds;
 
     /**
-     * Get the instanceIds value.
+     * Get the virtual machine scale set instance ids.
      *
      * @return the instanceIds value
      */
@@ -31,7 +31,7 @@ public List<String> instanceIds() {
     }
 
     /**
-     * Set the instanceIds value.
+     * Set the virtual machine scale set instance ids.
      *
      * @param instanceIds the instanceIds value to set
      * @return the VirtualMachineScaleSetVMInstanceRequiredIDs object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMProfile.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMProfile.java
index eb48fe1b92b5..e4f0a0c7ccab 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMProfile.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineScaleSetVMProfile.java
@@ -64,7 +64,7 @@ public class VirtualMachineScaleSetVMProfile {
     private String licenseType;
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machines in the scale set.
      *
      * @return the osProfile value
      */
@@ -73,7 +73,7 @@ public VirtualMachineScaleSetOSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machines in the scale set.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -84,7 +84,7 @@ public VirtualMachineScaleSetVMProfile withOsProfile(VirtualMachineScaleSetOSPro
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -93,7 +93,7 @@ public VirtualMachineScaleSetStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -104,7 +104,7 @@ public VirtualMachineScaleSetVMProfile withStorageProfile(VirtualMachineScaleSet
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies properties of the network interfaces of the virtual machines in the scale set.
      *
      * @return the networkProfile value
      */
@@ -113,7 +113,7 @@ public VirtualMachineScaleSetNetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies properties of the network interfaces of the virtual machines in the scale set.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -124,7 +124,7 @@ public VirtualMachineScaleSetVMProfile withNetworkProfile(VirtualMachineScaleSet
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -133,7 +133,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -144,7 +144,7 @@ public VirtualMachineScaleSetVMProfile withDiagnosticsProfile(DiagnosticsProfile
     }
 
     /**
-     * Get the extensionProfile value.
+     * Get specifies a collection of settings for extensions installed on virtual machines in the scale set.
      *
      * @return the extensionProfile value
      */
@@ -153,7 +153,7 @@ public VirtualMachineScaleSetExtensionProfile extensionProfile() {
     }
 
     /**
-     * Set the extensionProfile value.
+     * Set specifies a collection of settings for extensions installed on virtual machines in the scale set.
      *
      * @param extensionProfile the extensionProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -164,7 +164,7 @@ public VirtualMachineScaleSetVMProfile withExtensionProfile(VirtualMachineScaleS
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -173,7 +173,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineStatusCodeCount.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineStatusCodeCount.java
index 63955c4f10b4..012c41b2c5b7 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineStatusCodeCount.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineStatusCodeCount.java
@@ -28,7 +28,7 @@ public class VirtualMachineStatusCodeCount {
     private Integer count;
 
     /**
-     * Get the code value.
+     * Get the instance view status code.
      *
      * @return the code value
      */
@@ -37,7 +37,7 @@ public String code() {
     }
 
     /**
-     * Get the count value.
+     * Get the number of instances having a particular status code.
      *
      * @return the count value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMConfiguration.java
index 3ee49dcbf1d3..bb850c4ad8f0 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMConfiguration.java
@@ -22,7 +22,7 @@ public class WinRMConfiguration {
     private List<WinRMListener> listeners;
 
     /**
-     * Get the listeners value.
+     * Get the list of Windows Remote Management listeners.
      *
      * @return the listeners value
      */
@@ -31,7 +31,7 @@ public List<WinRMListener> listeners() {
     }
 
     /**
-     * Set the listeners value.
+     * Set the list of Windows Remote Management listeners.
      *
      * @param listeners the listeners value to set
      * @return the WinRMConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMListener.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMListener.java
index ef2a3d728615..2642737cb664 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMListener.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WinRMListener.java
@@ -38,7 +38,7 @@ public class WinRMListener {
     private String certificateUrl;
 
     /**
-     * Get the protocol value.
+     * Get specifies the protocol of listener. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;**http** &lt;br&gt;&lt;br&gt; **https**. Possible values include: 'Http', 'Https'.
      *
      * @return the protocol value
      */
@@ -47,7 +47,7 @@ public ProtocolTypes protocol() {
     }
 
     /**
-     * Set the protocol value.
+     * Set specifies the protocol of listener. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;**http** &lt;br&gt;&lt;br&gt; **https**. Possible values include: 'Http', 'Https'.
      *
      * @param protocol the protocol value to set
      * @return the WinRMListener object itself.
@@ -58,7 +58,7 @@ public WinRMListener withProtocol(ProtocolTypes protocol) {
     }
 
     /**
-     * Get the certificateUrl value.
+     * Get this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @return the certificateUrl value
      */
@@ -67,7 +67,7 @@ public String certificateUrl() {
     }
 
     /**
-     * Set the certificateUrl value.
+     * Set this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @param certificateUrl the certificateUrl value to set
      * @return the WinRMListener object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WindowsConfiguration.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WindowsConfiguration.java
index 7964be2e792a..edcba7395dcf 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WindowsConfiguration.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/WindowsConfiguration.java
@@ -53,7 +53,7 @@ public class WindowsConfiguration {
     private WinRMConfiguration winRM;
 
     /**
-     * Get the provisionVMAgent value.
+     * Get indicates whether virtual machine agent should be provisioned on the virtual machine. &lt;br&gt;&lt;br&gt; When this property is not specified in the request body, default behavior is to set it to true.  This will ensure that VM Agent is installed on the VM so that extensions can be added to the VM later.
      *
      * @return the provisionVMAgent value
      */
@@ -62,7 +62,7 @@ public Boolean provisionVMAgent() {
     }
 
     /**
-     * Set the provisionVMAgent value.
+     * Set indicates whether virtual machine agent should be provisioned on the virtual machine. &lt;br&gt;&lt;br&gt; When this property is not specified in the request body, default behavior is to set it to true.  This will ensure that VM Agent is installed on the VM so that extensions can be added to the VM later.
      *
      * @param provisionVMAgent the provisionVMAgent value to set
      * @return the WindowsConfiguration object itself.
@@ -73,7 +73,7 @@ public WindowsConfiguration withProvisionVMAgent(Boolean provisionVMAgent) {
     }
 
     /**
-     * Get the enableAutomaticUpdates value.
+     * Get indicates whether virtual machine is enabled for automatic updates.
      *
      * @return the enableAutomaticUpdates value
      */
@@ -82,7 +82,7 @@ public Boolean enableAutomaticUpdates() {
     }
 
     /**
-     * Set the enableAutomaticUpdates value.
+     * Set indicates whether virtual machine is enabled for automatic updates.
      *
      * @param enableAutomaticUpdates the enableAutomaticUpdates value to set
      * @return the WindowsConfiguration object itself.
@@ -93,7 +93,7 @@ public WindowsConfiguration withEnableAutomaticUpdates(Boolean enableAutomaticUp
     }
 
     /**
-     * Get the timeZone value.
+     * Get specifies the time zone of the virtual machine. e.g. "Pacific Standard Time".
      *
      * @return the timeZone value
      */
@@ -102,7 +102,7 @@ public String timeZone() {
     }
 
     /**
-     * Set the timeZone value.
+     * Set specifies the time zone of the virtual machine. e.g. "Pacific Standard Time".
      *
      * @param timeZone the timeZone value to set
      * @return the WindowsConfiguration object itself.
@@ -113,7 +113,7 @@ public WindowsConfiguration withTimeZone(String timeZone) {
     }
 
     /**
-     * Get the additionalUnattendContent value.
+     * Get specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup.
      *
      * @return the additionalUnattendContent value
      */
@@ -122,7 +122,7 @@ public List<AdditionalUnattendContent> additionalUnattendContent() {
     }
 
     /**
-     * Set the additionalUnattendContent value.
+     * Set specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup.
      *
      * @param additionalUnattendContent the additionalUnattendContent value to set
      * @return the WindowsConfiguration object itself.
@@ -133,7 +133,7 @@ public WindowsConfiguration withAdditionalUnattendContent(List<AdditionalUnatten
     }
 
     /**
-     * Get the winRM value.
+     * Get specifies the Windows Remote Management listeners. This enables remote Windows PowerShell.
      *
      * @return the winRM value
      */
@@ -142,7 +142,7 @@ public WinRMConfiguration winRM() {
     }
 
     /**
-     * Set the winRM value.
+     * Set specifies the Windows Remote Management listeners. This enables remote Windows PowerShell.
      *
      * @param winRM the winRM value to set
      * @return the WindowsConfiguration object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AccessUriInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AccessUriInner.java
index 7b6274d223eb..0f5aac4e640b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AccessUriInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AccessUriInner.java
@@ -23,7 +23,7 @@ public class AccessUriInner {
     private String accessSAS;
 
     /**
-     * Get the accessSAS value.
+     * Get a SAS uri for accessing a disk.
      *
      * @return the accessSAS value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetInner.java
index c84c07e25186..0fab3447a3d9 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetInner.java
@@ -61,7 +61,7 @@ public class AvailabilitySetInner extends Resource {
     private Sku sku;
 
     /**
-     * Get the platformUpdateDomainCount value.
+     * Get update Domain count.
      *
      * @return the platformUpdateDomainCount value
      */
@@ -70,7 +70,7 @@ public Integer platformUpdateDomainCount() {
     }
 
     /**
-     * Set the platformUpdateDomainCount value.
+     * Set update Domain count.
      *
      * @param platformUpdateDomainCount the platformUpdateDomainCount value to set
      * @return the AvailabilitySetInner object itself.
@@ -81,7 +81,7 @@ public AvailabilitySetInner withPlatformUpdateDomainCount(Integer platformUpdate
     }
 
     /**
-     * Get the platformFaultDomainCount value.
+     * Get fault Domain count.
      *
      * @return the platformFaultDomainCount value
      */
@@ -90,7 +90,7 @@ public Integer platformFaultDomainCount() {
     }
 
     /**
-     * Set the platformFaultDomainCount value.
+     * Set fault Domain count.
      *
      * @param platformFaultDomainCount the platformFaultDomainCount value to set
      * @return the AvailabilitySetInner object itself.
@@ -101,7 +101,7 @@ public AvailabilitySetInner withPlatformFaultDomainCount(Integer platformFaultDo
     }
 
     /**
-     * Get the virtualMachines value.
+     * Get a list of references to all virtual machines in the availability set.
      *
      * @return the virtualMachines value
      */
@@ -110,7 +110,7 @@ public List<SubResource> virtualMachines() {
     }
 
     /**
-     * Set the virtualMachines value.
+     * Set a list of references to all virtual machines in the availability set.
      *
      * @param virtualMachines the virtualMachines value to set
      * @return the AvailabilitySetInner object itself.
@@ -121,7 +121,7 @@ public AvailabilitySetInner withVirtualMachines(List<SubResource> virtualMachine
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -130,7 +130,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Get the sku value.
+     * Get sku of the availability set.
      *
      * @return the sku value
      */
@@ -139,7 +139,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set sku of the availability set.
      *
      * @param sku the sku value to set
      * @return the AvailabilitySetInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsImpl.java
index 75a993a43456..159edc27cb9b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsImpl.java
@@ -84,10 +84,34 @@ public PagedList<AvailabilitySet> listByResourceGroup(String resourceGroupName)
     public Observable<AvailabilitySet> listByResourceGroupAsync(String resourceGroupName) {
         AvailabilitySetsInner client = this.inner();
         return client.listByResourceGroupAsync(resourceGroupName)
-        .flatMap(new Func1<Page<AvailabilitySetInner>, Observable<AvailabilitySetInner>>() {
+        .flatMapIterable(new Func1<Page<AvailabilitySetInner>, Iterable<AvailabilitySetInner>>() {
             @Override
-            public Observable<AvailabilitySetInner> call(Page<AvailabilitySetInner> innerPage) {
-                return Observable.from(innerPage.items());
+            public Iterable<AvailabilitySetInner> call(Page<AvailabilitySetInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailabilitySetInner, AvailabilitySet>() {
+            @Override
+            public AvailabilitySet call(AvailabilitySetInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<AvailabilitySet> list() {
+        AvailabilitySetsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<AvailabilitySet> listAsync() {
+        AvailabilitySetsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<AvailabilitySetInner>, Iterable<AvailabilitySetInner>>() {
+            @Override
+            public Iterable<AvailabilitySetInner> call(Page<AvailabilitySetInner> page) {
+                return page.items();
             }
         })
         .map(new Func1<AvailabilitySetInner, AvailabilitySet>() {
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsInner.java
index ec2dcf15153d..4c45fc4cb0f7 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/AvailabilitySetsInner.java
@@ -10,9 +10,12 @@
 
 import com.microsoft.azure.arm.collection.InnerSupportsGet;
 import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
 import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.PagedList;
 import com.microsoft.rest.ServiceCallback;
@@ -30,6 +33,7 @@
 import retrofit2.http.Path;
 import retrofit2.http.PUT;
 import retrofit2.http.Query;
+import retrofit2.http.Url;
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
@@ -38,7 +42,7 @@
  * An instance of this class provides access to all the operations defined
  * in AvailabilitySets.
  */
-public class AvailabilitySetsInner implements InnerSupportsGet<AvailabilitySetInner>, InnerSupportsDelete<OperationStatusResponseInner> {
+public class AvailabilitySetsInner implements InnerSupportsGet<AvailabilitySetInner>, InnerSupportsDelete<OperationStatusResponseInner>, InnerSupportsListing<AvailabilitySetInner> {
     /** The Retrofit service to perform REST calls. */
     private AvailabilitySetsService service;
     /** The service client containing this operation class. */
@@ -72,6 +76,10 @@ interface AvailabilitySetsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}")
         Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("availabilitySetName") String availabilitySetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySets list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySets listByResourceGroup" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets")
         Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -80,6 +88,14 @@ interface AvailabilitySetsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes")
         Observable<Response<ResponseBody>> listAvailableSizes(@Path("resourceGroupName") String resourceGroupName, @Path("availabilitySetName") String availabilitySetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySets listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySets listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -349,20 +365,128 @@ private ServiceResponse<AvailabilitySetInner> getByResourceGroupDelegate(Respons
                 .build(response);
     }
 
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> list() {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @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<List<AvailabilitySetInner>> listAsync(final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailabilitySetInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailabilitySetInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailabilitySetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the PagedList<AvailabilitySetInner> object if successful.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
      */
-    public PagedList<AvailabilitySetInner> listByResourceGroup(String resourceGroupName) {
-        PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-        page.setItems(listByResourceGroupWithServiceResponseAsync(resourceGroupName).toBlocking().single().body());
-        page.setNextPageLink(null);
-        return new PagedList<AvailabilitySetInner>(page) {
+    public PagedList<AvailabilitySetInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
             @Override
             public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
-                return null;
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -372,36 +496,67 @@ public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
      *
      * @param resourceGroupName The name of the resource group.
      * @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<List<AvailabilitySetInner>> listByResourceGroupAsync(String resourceGroupName, final ServiceCallback<List<AvailabilitySetInner>> serviceCallback) {
-        return ServiceFuture.fromResponse(listByResourceGroupWithServiceResponseAsync(resourceGroupName), serviceCallback);
+    public ServiceFuture<List<AvailabilitySetInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the observable to the List&lt;AvailabilitySetInner&gt; object
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
      */
-    public Observable<Page<AvailabilitySetInner>> listByResourceGroupAsync(String resourceGroupName) {
-        return listByResourceGroupWithServiceResponseAsync(resourceGroupName).map(new Func1<ServiceResponse<List<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
-            @Override
-            public Page<AvailabilitySetInner> call(ServiceResponse<List<AvailabilitySetInner>> response) {
-                PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-                page.setItems(response.body());
-                return page;
-            }
-        });
+    public Observable<Page<AvailabilitySetInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the observable to the List&lt;AvailabilitySetInner&gt; object
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+    ServiceResponse<PageImpl<AvailabilitySetInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<List<AvailabilitySetInner>>> listByResourceGroupWithServiceResponseAsync(String resourceGroupName) {
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -412,17 +567,12 @@ public Observable<ServiceResponse<List<AvailabilitySetInner>>> listByResourceGro
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<AvailabilitySetInner>>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<List<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
                     try {
                         ServiceResponse<PageImpl<AvailabilitySetInner>> result = listByResourceGroupDelegate(response);
-                        List<AvailabilitySetInner> items = null;
-                        if (result.body() != null) {
-                            items = result.body().items();
-                        }
-                        ServiceResponse<List<AvailabilitySetInner>> clientResponse = new ServiceResponse<List<AvailabilitySetInner>>(items, result.response());
-                        return Observable.just(clientResponse);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -507,7 +657,7 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> listAvailableS
                 @Override
                 public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<VirtualMachineSizeInner>> result = listAvailableSizesDelegate(response);
+                        ServiceResponse<PageImpl1<VirtualMachineSizeInner>> result = listAvailableSizesDelegate(response);
                         List<VirtualMachineSizeInner> items = null;
                         if (result.body() != null) {
                             items = result.body().items();
@@ -521,9 +671,231 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<VirtualMachineSizeInner>> listAvailableSizesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<VirtualMachineSizeInner>>() { }.getType())
+    private ServiceResponse<PageImpl1<VirtualMachineSizeInner>> listAvailableSizesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<VirtualMachineSizeInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<AvailabilitySetInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailabilitySetInner>> serviceFuture, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+    ServiceResponse<PageImpl<AvailabilitySetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailabilitySetInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailabilitySetInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailabilitySetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<AvailabilitySetInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AvailabilitySetInner>> serviceFuture, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+    ServiceResponse<PageImpl<AvailabilitySetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<AvailabilitySetInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<AvailabilitySetInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<AvailabilitySetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DiskInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DiskInner.java
index f53a7ed22ed8..22c14dada562 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DiskInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DiskInner.java
@@ -83,7 +83,7 @@ public class DiskInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the managedBy value.
+     * Get a relative URI containing the ID of the VM that has the disk attached.
      *
      * @return the managedBy value
      */
@@ -112,7 +112,7 @@ public DiskInner withSku(DiskSku sku) {
     }
 
     /**
-     * Get the zones value.
+     * Get the Logical zone list for Disk.
      *
      * @return the zones value
      */
@@ -121,7 +121,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the Logical zone list for Disk.
      *
      * @param zones the zones value to set
      * @return the DiskInner object itself.
@@ -132,7 +132,7 @@ public DiskInner withZones(List<String> zones) {
     }
 
     /**
-     * Get the timeCreated value.
+     * Get the time when the disk was created.
      *
      * @return the timeCreated value
      */
@@ -141,7 +141,7 @@ public DateTime timeCreated() {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -150,7 +150,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the DiskInner object itself.
@@ -161,7 +161,7 @@ public DiskInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the creationData value.
+     * Get disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @return the creationData value
      */
@@ -170,7 +170,7 @@ public CreationData creationData() {
     }
 
     /**
-     * Set the creationData value.
+     * Set disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @param creationData the creationData value to set
      * @return the DiskInner object itself.
@@ -181,7 +181,7 @@ public DiskInner withCreationData(CreationData creationData) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -190,7 +190,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DiskInner object itself.
@@ -201,7 +201,7 @@ public DiskInner withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -210,7 +210,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskInner object itself.
@@ -221,7 +221,7 @@ public DiskInner withEncryptionSettings(EncryptionSettings encryptionSettings) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the disk provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DisksInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DisksInner.java
index 8ae8cf5e94f5..8a1a1585d79a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DisksInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/DisksInner.java
@@ -797,7 +797,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(ServiceResponse<Page<Di
     /**
      * Lists all the disks under a resource group.
      *
-    ServiceResponse<PageImpl1<DiskInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<DiskInner>> * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;DiskInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -816,7 +816,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> listByResourceGroupSinglePag
                 @Override
                 public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<DiskInner>> result = listByResourceGroupDelegate(response);
+                        ServiceResponse<PageImpl<DiskInner>> result = listByResourceGroupDelegate(response);
                         return Observable.just(new ServiceResponse<Page<DiskInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -825,9 +825,9 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<DiskInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<DiskInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DiskInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DiskInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -923,7 +923,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> listSinglePageAsync() {
                 @Override
                 public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<DiskInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<DiskInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<DiskInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -932,9 +932,9 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<DiskInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<DiskInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DiskInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DiskInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1348,7 +1348,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(ServiceResponse<Page<Di
     /**
      * Lists all the disks under a resource group.
      *
-    ServiceResponse<PageImpl1<DiskInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<DiskInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;DiskInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1362,7 +1362,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> listByResourceGroupNextSingl
                 @Override
                 public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<DiskInner>> result = listByResourceGroupNextDelegate(response);
+                        ServiceResponse<PageImpl<DiskInner>> result = listByResourceGroupNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<DiskInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1371,9 +1371,9 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<DiskInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<DiskInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DiskInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DiskInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1459,7 +1459,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(ServiceResponse<Page<Di
     /**
      * Lists all the disks under a subscription.
      *
-    ServiceResponse<PageImpl1<DiskInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<DiskInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;DiskInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1473,7 +1473,7 @@ public Observable<ServiceResponse<Page<DiskInner>>> listNextSinglePageAsync(fina
                 @Override
                 public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<DiskInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<DiskInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<DiskInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1482,9 +1482,9 @@ public Observable<ServiceResponse<Page<DiskInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<DiskInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<DiskInner>>() { }.getType())
+    private ServiceResponse<PageImpl<DiskInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<DiskInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<DiskInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImageInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImageInner.java
index e82f8ed333db..7103d2cab8fb 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImageInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImageInner.java
@@ -40,7 +40,7 @@ public class ImageInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the sourceVirtualMachine value.
+     * Get the source virtual machine from which Image is created.
      *
      * @return the sourceVirtualMachine value
      */
@@ -49,7 +49,7 @@ public SubResource sourceVirtualMachine() {
     }
 
     /**
-     * Set the sourceVirtualMachine value.
+     * Set the source virtual machine from which Image is created.
      *
      * @param sourceVirtualMachine the sourceVirtualMachine value to set
      * @return the ImageInner object itself.
@@ -60,7 +60,7 @@ public ImageInner withSourceVirtualMachine(SubResource sourceVirtualMachine) {
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -69,7 +69,7 @@ public ImageStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the ImageInner object itself.
@@ -80,7 +80,7 @@ public ImageInner withStorageProfile(ImageStorageProfile storageProfile) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImagesInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImagesInner.java
index cc464508cfe6..582544f89481 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImagesInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ImagesInner.java
@@ -681,7 +681,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(ServiceResponse<Page<I
     /**
      * Gets the list of images under a resource group.
      *
-    ServiceResponse<PageImpl1<ImageInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ImageInner>> * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ImageInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -700,7 +700,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> listByResourceGroupSinglePa
                 @Override
                 public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ImageInner>> result = listByResourceGroupDelegate(response);
+                        ServiceResponse<PageImpl<ImageInner>> result = listByResourceGroupDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ImageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -709,9 +709,9 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<ImageInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ImageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ImageInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ImageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -807,7 +807,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> listSinglePageAsync() {
                 @Override
                 public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ImageInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<ImageInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ImageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -816,9 +816,9 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<ImageInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ImageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ImageInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ImageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -904,7 +904,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(ServiceResponse<Page<I
     /**
      * Gets the list of images under a resource group.
      *
-    ServiceResponse<PageImpl1<ImageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<ImageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ImageInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -918,7 +918,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> listByResourceGroupNextSing
                 @Override
                 public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ImageInner>> result = listByResourceGroupNextDelegate(response);
+                        ServiceResponse<PageImpl<ImageInner>> result = listByResourceGroupNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ImageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -927,9 +927,9 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<ImageInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ImageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ImageInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ImageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1015,7 +1015,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(ServiceResponse<Page<I
     /**
      * Gets the list of Images in the subscription. Use nextLink property in the response to get the next page of Images. Do this till nextLink is null to fetch all the Images.
      *
-    ServiceResponse<PageImpl1<ImageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<ImageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ImageInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1029,7 +1029,7 @@ public Observable<ServiceResponse<Page<ImageInner>>> listNextSinglePageAsync(fin
                 @Override
                 public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ImageInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<ImageInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ImageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1038,9 +1038,9 @@ public Observable<ServiceResponse<Page<ImageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<ImageInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ImageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ImageInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ImageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ImageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/OperationStatusResponseInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/OperationStatusResponseInner.java
index b374aed6cc24..aee52bdc0eac 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/OperationStatusResponseInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/OperationStatusResponseInner.java
@@ -47,7 +47,7 @@ public class OperationStatusResponseInner {
     private ApiError error;
 
     /**
-     * Get the name value.
+     * Get operation ID.
      *
      * @return the name value
      */
@@ -56,7 +56,7 @@ public String name() {
     }
 
     /**
-     * Get the status value.
+     * Get operation status.
      *
      * @return the status value
      */
@@ -65,7 +65,7 @@ public String status() {
     }
 
     /**
-     * Get the startTime value.
+     * Get start time of the operation.
      *
      * @return the startTime value
      */
@@ -74,7 +74,7 @@ public DateTime startTime() {
     }
 
     /**
-     * Get the endTime value.
+     * Get end time of the operation.
      *
      * @return the endTime value
      */
@@ -83,7 +83,7 @@ public DateTime endTime() {
     }
 
     /**
-     * Get the error value.
+     * Get api error.
      *
      * @return the error value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl.java
index d45204eb0680..e8bac3d82366 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl.java
@@ -22,7 +22,7 @@ public class PageImpl<T> implements Page<T> {
     /**
      * The link to the next page.
      */
-    @JsonProperty("")
+    @JsonProperty("nextLink")
     private String nextPageLink;
 
     /**
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl1.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl1.java
index dea4da1fef03..04155bfc51ef 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl1.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/PageImpl1.java
@@ -22,7 +22,7 @@ public class PageImpl1<T> implements Page<T> {
     /**
      * The link to the next page.
      */
-    @JsonProperty("nextLink")
+    @JsonProperty("")
     private String nextPageLink;
 
     /**
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkuInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkuInner.java
index ca1f725bd3c3..bc3cf04734c4 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkuInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkuInner.java
@@ -95,7 +95,7 @@ public class ResourceSkuInner {
     private List<ResourceSkuRestrictions> restrictions;
 
     /**
-     * Get the resourceType value.
+     * Get the type of resource the SKU applies to.
      *
      * @return the resourceType value
      */
@@ -104,7 +104,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the name value.
+     * Get the name of SKU.
      *
      * @return the name value
      */
@@ -113,7 +113,7 @@ public String name() {
     }
 
     /**
-     * Get the tier value.
+     * Get specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @return the tier value
      */
@@ -122,7 +122,7 @@ public String tier() {
     }
 
     /**
-     * Get the size value.
+     * Get the Size of the SKU.
      *
      * @return the size value
      */
@@ -131,7 +131,7 @@ public String size() {
     }
 
     /**
-     * Get the family value.
+     * Get the Family of this particular SKU.
      *
      * @return the family value
      */
@@ -140,7 +140,7 @@ public String family() {
     }
 
     /**
-     * Get the kind value.
+     * Get the Kind of resources that are supported in this SKU.
      *
      * @return the kind value
      */
@@ -149,7 +149,7 @@ public String kind() {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
@@ -158,7 +158,7 @@ public ResourceSkuCapacity capacity() {
     }
 
     /**
-     * Get the locations value.
+     * Get the set of locations that the SKU is available.
      *
      * @return the locations value
      */
@@ -167,7 +167,7 @@ public List<String> locations() {
     }
 
     /**
-     * Get the apiVersions value.
+     * Get the api versions that support this SKU.
      *
      * @return the apiVersions value
      */
@@ -176,7 +176,7 @@ public List<String> apiVersions() {
     }
 
     /**
-     * Get the costs value.
+     * Get metadata for retrieving price info.
      *
      * @return the costs value
      */
@@ -185,7 +185,7 @@ public List<ResourceSkuCosts> costs() {
     }
 
     /**
-     * Get the capabilities value.
+     * Get a name value pair to describe the capability.
      *
      * @return the capabilities value
      */
@@ -194,7 +194,7 @@ public List<ResourceSkuCapabilities> capabilities() {
     }
 
     /**
-     * Get the restrictions value.
+     * Get the restrictions because of which SKU cannot be used. This is empty if there are no restrictions.
      *
      * @return the restrictions value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusImpl.java
index 6ee776e9f26d..c46f3f4ced40 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusImpl.java
@@ -37,7 +37,8 @@ public Observable<ResourceSku> listAsync() {
             public Iterable<ResourceSkuInner> call(Page<ResourceSkuInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<ResourceSkuInner, ResourceSku>() {
+        })
+        .map(new Func1<ResourceSkuInner, ResourceSku>() {
             @Override
             public ResourceSku call(ResourceSkuInner inner) {
                 return new ResourceSkuImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusInner.java
index 15f97bba754c..3e27cc8badab 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/ResourceSkusInner.java
@@ -157,7 +157,7 @@ public Observable<ServiceResponse<Page<ResourceSkuInner>>> listSinglePageAsync()
                 @Override
                 public Observable<ServiceResponse<Page<ResourceSkuInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ResourceSkuInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<ResourceSkuInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ResourceSkuInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -166,9 +166,9 @@ public Observable<ServiceResponse<Page<ResourceSkuInner>>> call(Response<Respons
             });
     }
 
-    private ServiceResponse<PageImpl1<ResourceSkuInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ResourceSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ResourceSkuInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ResourceSkuInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceSkuInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -254,7 +254,7 @@ public Observable<ServiceResponse<Page<ResourceSkuInner>>> call(ServiceResponse<
     /**
      * Gets the list of Microsoft.Compute SKUs available for your Subscription.
      *
-    ServiceResponse<PageImpl1<ResourceSkuInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<ResourceSkuInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ResourceSkuInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -268,7 +268,7 @@ public Observable<ServiceResponse<Page<ResourceSkuInner>>> listNextSinglePageAsy
                 @Override
                 public Observable<ServiceResponse<Page<ResourceSkuInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<ResourceSkuInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<ResourceSkuInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<ResourceSkuInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -277,9 +277,9 @@ public Observable<ServiceResponse<Page<ResourceSkuInner>>> call(Response<Respons
             });
     }
 
-    private ServiceResponse<PageImpl1<ResourceSkuInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ResourceSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<ResourceSkuInner>>() { }.getType())
+    private ServiceResponse<PageImpl<ResourceSkuInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ResourceSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ResourceSkuInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RollingUpgradeStatusInfoInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RollingUpgradeStatusInfoInner.java
index f2ce3e57997d..12ad14318a51 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RollingUpgradeStatusInfoInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RollingUpgradeStatusInfoInner.java
@@ -47,7 +47,7 @@ public class RollingUpgradeStatusInfoInner extends Resource {
     private ApiError error;
 
     /**
-     * Get the policy value.
+     * Get the rolling upgrade policies applied for this upgrade.
      *
      * @return the policy value
      */
@@ -56,7 +56,7 @@ public RollingUpgradePolicy policy() {
     }
 
     /**
-     * Get the runningStatus value.
+     * Get information about the current running state of the overall upgrade.
      *
      * @return the runningStatus value
      */
@@ -65,7 +65,7 @@ public RollingUpgradeRunningStatus runningStatus() {
     }
 
     /**
-     * Get the progress value.
+     * Get information about the number of virtual machine instances in each upgrade state.
      *
      * @return the progress value
      */
@@ -74,7 +74,7 @@ public RollingUpgradeProgressInfo progress() {
     }
 
     /**
-     * Get the error value.
+     * Get error details for this upgrade, if there are any.
      *
      * @return the error value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentBaseInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentBaseInner.java
index fe4696407011..103e58d34d91 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentBaseInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentBaseInner.java
@@ -46,7 +46,7 @@ public class RunCommandDocumentBaseInner {
     private String description;
 
     /**
-     * Get the schema value.
+     * Get the VM run command schema.
      *
      * @return the schema value
      */
@@ -55,7 +55,7 @@ public String schema() {
     }
 
     /**
-     * Set the schema value.
+     * Set the VM run command schema.
      *
      * @param schema the schema value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -66,7 +66,7 @@ public RunCommandDocumentBaseInner withSchema(String schema) {
     }
 
     /**
-     * Get the id value.
+     * Get the VM run command id.
      *
      * @return the id value
      */
@@ -75,7 +75,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the VM run command id.
      *
      * @param id the id value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -86,7 +86,7 @@ public RunCommandDocumentBaseInner withId(String id) {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -95,7 +95,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -106,7 +106,7 @@ public RunCommandDocumentBaseInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the label value.
+     * Get the VM run command label.
      *
      * @return the label value
      */
@@ -115,7 +115,7 @@ public String label() {
     }
 
     /**
-     * Set the label value.
+     * Set the VM run command label.
      *
      * @param label the label value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -126,7 +126,7 @@ public RunCommandDocumentBaseInner withLabel(String label) {
     }
 
     /**
-     * Get the description value.
+     * Get the VM run command description.
      *
      * @return the description value
      */
@@ -135,7 +135,7 @@ public String description() {
     }
 
     /**
-     * Set the description value.
+     * Set the VM run command description.
      *
      * @param description the description value to set
      * @return the RunCommandDocumentBaseInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentInner.java
index 26c9b200d2f0..100d65bb7a6f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandDocumentInner.java
@@ -29,7 +29,7 @@ public class RunCommandDocumentInner extends RunCommandDocumentBaseInner {
     private List<RunCommandParameterDefinition> parameters;
 
     /**
-     * Get the script value.
+     * Get the script to be executed.
      *
      * @return the script value
      */
@@ -38,7 +38,7 @@ public List<String> script() {
     }
 
     /**
-     * Set the script value.
+     * Set the script to be executed.
      *
      * @param script the script value to set
      * @return the RunCommandDocumentInner object itself.
@@ -49,7 +49,7 @@ public RunCommandDocumentInner withScript(List<String> script) {
     }
 
     /**
-     * Get the parameters value.
+     * Get the parameters used by the script.
      *
      * @return the parameters value
      */
@@ -58,7 +58,7 @@ public List<RunCommandParameterDefinition> parameters() {
     }
 
     /**
-     * Set the parameters value.
+     * Set the parameters used by the script.
      *
      * @param parameters the parameters value to set
      * @return the RunCommandDocumentInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandResultInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandResultInner.java
index 41fc0773f32c..d206abb6d592 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandResultInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/RunCommandResultInner.java
@@ -23,7 +23,7 @@ public class RunCommandResultInner extends OperationStatusResponseInner {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -32,7 +32,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the RunCommandResultInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotInner.java
index c41802fa8d11..c6157eead297 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotInner.java
@@ -76,7 +76,7 @@ public class SnapshotInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the managedBy value.
+     * Get unused. Always Null.
      *
      * @return the managedBy value
      */
@@ -105,7 +105,7 @@ public SnapshotInner withSku(DiskSku sku) {
     }
 
     /**
-     * Get the timeCreated value.
+     * Get the time when the disk was created.
      *
      * @return the timeCreated value
      */
@@ -114,7 +114,7 @@ public DateTime timeCreated() {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -123,7 +123,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the SnapshotInner object itself.
@@ -134,7 +134,7 @@ public SnapshotInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the creationData value.
+     * Get disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @return the creationData value
      */
@@ -143,7 +143,7 @@ public CreationData creationData() {
     }
 
     /**
-     * Set the creationData value.
+     * Set disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @param creationData the creationData value to set
      * @return the SnapshotInner object itself.
@@ -154,7 +154,7 @@ public SnapshotInner withCreationData(CreationData creationData) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -163,7 +163,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the SnapshotInner object itself.
@@ -174,7 +174,7 @@ public SnapshotInner withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -183,7 +183,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the SnapshotInner object itself.
@@ -194,7 +194,7 @@ public SnapshotInner withEncryptionSettings(EncryptionSettings encryptionSetting
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the disk provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotsInner.java
index c49248196a2b..979bbeb8d33d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/SnapshotsInner.java
@@ -797,7 +797,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(ServiceResponse<Pag
     /**
      * Lists snapshots under a resource group.
      *
-    ServiceResponse<PageImpl1<SnapshotInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<SnapshotInner>> * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;SnapshotInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -816,7 +816,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> listByResourceGroupSingl
                 @Override
                 public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<SnapshotInner>> result = listByResourceGroupDelegate(response);
+                        ServiceResponse<PageImpl<SnapshotInner>> result = listByResourceGroupDelegate(response);
                         return Observable.just(new ServiceResponse<Page<SnapshotInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -825,9 +825,9 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<PageImpl1<SnapshotInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<SnapshotInner>>() { }.getType())
+    private ServiceResponse<PageImpl<SnapshotInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SnapshotInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -923,7 +923,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> listSinglePageAsync() {
                 @Override
                 public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<SnapshotInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<SnapshotInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<SnapshotInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -932,9 +932,9 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<PageImpl1<SnapshotInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<SnapshotInner>>() { }.getType())
+    private ServiceResponse<PageImpl<SnapshotInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SnapshotInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1348,7 +1348,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(ServiceResponse<Pag
     /**
      * Lists snapshots under a resource group.
      *
-    ServiceResponse<PageImpl1<SnapshotInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<SnapshotInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;SnapshotInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1362,7 +1362,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> listByResourceGroupNextS
                 @Override
                 public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<SnapshotInner>> result = listByResourceGroupNextDelegate(response);
+                        ServiceResponse<PageImpl<SnapshotInner>> result = listByResourceGroupNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<SnapshotInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1371,9 +1371,9 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<PageImpl1<SnapshotInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<SnapshotInner>>() { }.getType())
+    private ServiceResponse<PageImpl<SnapshotInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SnapshotInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1459,7 +1459,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(ServiceResponse<Pag
     /**
      * Lists snapshots under a subscription.
      *
-    ServiceResponse<PageImpl1<SnapshotInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<SnapshotInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;SnapshotInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1473,7 +1473,7 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> listNextSinglePageAsync(
                 @Override
                 public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<SnapshotInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<SnapshotInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<SnapshotInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1482,9 +1482,9 @@ public Observable<ServiceResponse<Page<SnapshotInner>>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<PageImpl1<SnapshotInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<SnapshotInner>>() { }.getType())
+    private ServiceResponse<PageImpl<SnapshotInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<SnapshotInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<SnapshotInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsageInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsageInner.java
index 49f7d996cabd..753222a9ad18 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsageInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsageInner.java
@@ -41,13 +41,16 @@ public class UsageInner {
 
     /**
      * Creates an instance of UsageInner class.
+     * @param currentValue the current usage of the resource.
+     * @param limit the maximum permitted usage of the resource.
+     * @param name the name of the type of usage.
      */
     public UsageInner() {
         unit = "Count";
     }
 
     /**
-     * Get the unit value.
+     * Get an enum describing the unit of usage measurement.
      *
      * @return the unit value
      */
@@ -56,7 +59,7 @@ public String unit() {
     }
 
     /**
-     * Set the unit value.
+     * Set an enum describing the unit of usage measurement.
      *
      * @param unit the unit value to set
      * @return the UsageInner object itself.
@@ -67,7 +70,7 @@ public UsageInner withUnit(String unit) {
     }
 
     /**
-     * Get the currentValue value.
+     * Get the current usage of the resource.
      *
      * @return the currentValue value
      */
@@ -76,7 +79,7 @@ public int currentValue() {
     }
 
     /**
-     * Set the currentValue value.
+     * Set the current usage of the resource.
      *
      * @param currentValue the currentValue value to set
      * @return the UsageInner object itself.
@@ -87,7 +90,7 @@ public UsageInner withCurrentValue(int currentValue) {
     }
 
     /**
-     * Get the limit value.
+     * Get the maximum permitted usage of the resource.
      *
      * @return the limit value
      */
@@ -96,7 +99,7 @@ public long limit() {
     }
 
     /**
-     * Set the limit value.
+     * Set the maximum permitted usage of the resource.
      *
      * @param limit the limit value to set
      * @return the UsageInner object itself.
@@ -107,7 +110,7 @@ public UsageInner withLimit(long limit) {
     }
 
     /**
-     * Get the name value.
+     * Get the name of the type of usage.
      *
      * @return the name value
      */
@@ -116,7 +119,7 @@ public UsageName name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the type of usage.
      *
      * @param name the name value to set
      * @return the UsageInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsagesInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsagesInner.java
index 6f2a1857ee95..83134f5d6c3f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsagesInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/UsagesInner.java
@@ -146,7 +146,7 @@ public Observable<ServiceResponse<Page<UsageInner>>> call(ServiceResponse<Page<U
     /**
      * Gets, for the specified location, the current compute resource usage information as well as the limits for compute resources under the subscription.
      *
-    ServiceResponse<PageImpl1<UsageInner>> * @param location The location for which resource usage is queried.
+    ServiceResponse<PageImpl<UsageInner>> * @param location The location for which resource usage is queried.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;UsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -165,7 +165,7 @@ public Observable<ServiceResponse<Page<UsageInner>>> listSinglePageAsync(final S
                 @Override
                 public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<UsageInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<UsageInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<UsageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -174,9 +174,9 @@ public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<UsageInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<UsageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<UsageInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<UsageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -262,7 +262,7 @@ public Observable<ServiceResponse<Page<UsageInner>>> call(ServiceResponse<Page<U
     /**
      * Gets, for the specified location, the current compute resource usage information as well as the limits for compute resources under the subscription.
      *
-    ServiceResponse<PageImpl1<UsageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<UsageInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;UsageInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -276,7 +276,7 @@ public Observable<ServiceResponse<Page<UsageInner>>> listNextSinglePageAsync(fin
                 @Override
                 public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<UsageInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<UsageInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<UsageInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -285,9 +285,9 @@ public Observable<ServiceResponse<Page<UsageInner>>> call(Response<ResponseBody>
             });
     }
 
-    private ServiceResponse<PageImpl1<UsageInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<UsageInner>>() { }.getType())
+    private ServiceResponse<PageImpl<UsageInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<UsageInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<UsageInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineCaptureResultInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineCaptureResultInner.java
index f9d1e66d87de..1ed5d0a3355a 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineCaptureResultInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineCaptureResultInner.java
@@ -24,7 +24,7 @@ public class VirtualMachineCaptureResultInner extends SubResource {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -33,7 +33,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the VirtualMachineCaptureResultInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImageInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImageInner.java
index 9a312dfa56f1..c31485ea1311 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImageInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImageInner.java
@@ -52,7 +52,7 @@ public class VirtualMachineExtensionImageInner extends Resource {
     private Boolean supportsMultipleExtensions;
 
     /**
-     * Get the operatingSystem value.
+     * Get the operating system this extension supports.
      *
      * @return the operatingSystem value
      */
@@ -61,7 +61,7 @@ public String operatingSystem() {
     }
 
     /**
-     * Set the operatingSystem value.
+     * Set the operating system this extension supports.
      *
      * @param operatingSystem the operatingSystem value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -72,7 +72,7 @@ public VirtualMachineExtensionImageInner withOperatingSystem(String operatingSys
     }
 
     /**
-     * Get the computeRole value.
+     * Get the type of role (IaaS or PaaS) this extension supports.
      *
      * @return the computeRole value
      */
@@ -81,7 +81,7 @@ public String computeRole() {
     }
 
     /**
-     * Set the computeRole value.
+     * Set the type of role (IaaS or PaaS) this extension supports.
      *
      * @param computeRole the computeRole value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -92,7 +92,7 @@ public VirtualMachineExtensionImageInner withComputeRole(String computeRole) {
     }
 
     /**
-     * Get the handlerSchema value.
+     * Get the schema defined by publisher, where extension consumers should provide settings in a matching schema.
      *
      * @return the handlerSchema value
      */
@@ -101,7 +101,7 @@ public String handlerSchema() {
     }
 
     /**
-     * Set the handlerSchema value.
+     * Set the schema defined by publisher, where extension consumers should provide settings in a matching schema.
      *
      * @param handlerSchema the handlerSchema value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -112,7 +112,7 @@ public VirtualMachineExtensionImageInner withHandlerSchema(String handlerSchema)
     }
 
     /**
-     * Get the vmScaleSetEnabled value.
+     * Get whether the extension can be used on xRP VMScaleSets. By default existing extensions are usable on scalesets, but there might be cases where a publisher wants to explicitly indicate the extension is only enabled for CRP VMs but not VMSS.
      *
      * @return the vmScaleSetEnabled value
      */
@@ -121,7 +121,7 @@ public Boolean vmScaleSetEnabled() {
     }
 
     /**
-     * Set the vmScaleSetEnabled value.
+     * Set whether the extension can be used on xRP VMScaleSets. By default existing extensions are usable on scalesets, but there might be cases where a publisher wants to explicitly indicate the extension is only enabled for CRP VMs but not VMSS.
      *
      * @param vmScaleSetEnabled the vmScaleSetEnabled value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -132,7 +132,7 @@ public VirtualMachineExtensionImageInner withVmScaleSetEnabled(Boolean vmScaleSe
     }
 
     /**
-     * Get the supportsMultipleExtensions value.
+     * Get whether the handler can support multiple extensions.
      *
      * @return the supportsMultipleExtensions value
      */
@@ -141,7 +141,7 @@ public Boolean supportsMultipleExtensions() {
     }
 
     /**
-     * Set the supportsMultipleExtensions value.
+     * Set whether the handler can support multiple extensions.
      *
      * @param supportsMultipleExtensions the supportsMultipleExtensions value to set
      * @return the VirtualMachineExtensionImageInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImagesImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImagesImpl.java
index 497393e10526..6626aa8bf4d4 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImagesImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionImagesImpl.java
@@ -80,7 +80,8 @@ public Observable<VirtualMachineExtensionImage> listTypesAsync(String location,
             public Observable<VirtualMachineExtensionImageInner> call(List<VirtualMachineExtensionImageInner> innerList) {
                 return Observable.from(innerList);
             }
-        })    .map(new Func1<VirtualMachineExtensionImageInner, VirtualMachineExtensionImage>() {
+        })
+        .map(new Func1<VirtualMachineExtensionImageInner, VirtualMachineExtensionImage>() {
             @Override
             public VirtualMachineExtensionImage call(VirtualMachineExtensionImageInner inner) {
                 return new VirtualMachineExtensionImageImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionInner.java
index 9b58ca810675..fc543c3ba5fb 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionInner.java
@@ -79,7 +79,7 @@ public class VirtualMachineExtensionInner extends Resource {
     private VirtualMachineExtensionInstanceView instanceView;
 
     /**
-     * Get the forceUpdateTag value.
+     * Get how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -88,7 +88,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -99,7 +99,7 @@ public VirtualMachineExtensionInner withForceUpdateTag(String forceUpdateTag) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -108,7 +108,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -119,7 +119,7 @@ public VirtualMachineExtensionInner withPublisher(String publisher) {
     }
 
     /**
-     * Get the virtualMachineExtensionType value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the virtualMachineExtensionType value
      */
@@ -128,7 +128,7 @@ public String virtualMachineExtensionType() {
     }
 
     /**
-     * Set the virtualMachineExtensionType value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param virtualMachineExtensionType the virtualMachineExtensionType value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -139,7 +139,7 @@ public VirtualMachineExtensionInner withVirtualMachineExtensionType(String virtu
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -148,7 +148,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -159,7 +159,7 @@ public VirtualMachineExtensionInner withTypeHandlerVersion(String typeHandlerVer
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -168,7 +168,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -179,7 +179,7 @@ public VirtualMachineExtensionInner withAutoUpgradeMinorVersion(Boolean autoUpgr
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -188,7 +188,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -199,7 +199,7 @@ public VirtualMachineExtensionInner withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -208,7 +208,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -219,7 +219,7 @@ public VirtualMachineExtensionInner withProtectedSettings(Object protectedSettin
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -228,7 +228,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine extension instance view.
      *
      * @return the instanceView value
      */
@@ -237,7 +237,7 @@ public VirtualMachineExtensionInstanceView instanceView() {
     }
 
     /**
-     * Set the instanceView value.
+     * Set the virtual machine extension instance view.
      *
      * @param instanceView the instanceView value to set
      * @return the VirtualMachineExtensionInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsListResultInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsListResultInner.java
index 5601df2cc533..ffc8e4af0ecc 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsListResultInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsListResultInner.java
@@ -22,7 +22,7 @@ public class VirtualMachineExtensionsListResultInner {
     private List<VirtualMachineExtensionInner> value;
 
     /**
-     * Get the value value.
+     * Get the list of extensions.
      *
      * @return the value value
      */
@@ -31,7 +31,7 @@ public List<VirtualMachineExtensionInner> value() {
     }
 
     /**
-     * Set the value value.
+     * Set the list of extensions.
      *
      * @param value the value value to set
      * @return the VirtualMachineExtensionsListResultInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImageResourceInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImageResourceInner.java
index ec2ed25f8b7f..5c9b1603258c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImageResourceInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImageResourceInner.java
@@ -37,7 +37,7 @@ public class VirtualMachineImageResourceInner extends SubResource {
     private Map<String, String> tags;
 
     /**
-     * Get the name value.
+     * Get the name of the resource.
      *
      * @return the name value
      */
@@ -46,7 +46,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the resource.
      *
      * @param name the name value to set
      * @return the VirtualMachineImageResourceInner object itself.
@@ -57,7 +57,7 @@ public VirtualMachineImageResourceInner withName(String name) {
     }
 
     /**
-     * Get the location value.
+     * Get the supported Azure location of the resource.
      *
      * @return the location value
      */
@@ -66,7 +66,7 @@ public String location() {
     }
 
     /**
-     * Set the location value.
+     * Set the supported Azure location of the resource.
      *
      * @param location the location value to set
      * @return the VirtualMachineImageResourceInner object itself.
@@ -77,7 +77,7 @@ public VirtualMachineImageResourceInner withLocation(String location) {
     }
 
     /**
-     * Get the tags value.
+     * Get specifies the tags that are assigned to the virtual machine. For more information about using tags, see [Using tags to organize your Azure resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
      *
      * @return the tags value
      */
@@ -86,7 +86,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set specifies the tags that are assigned to the virtual machine. For more information about using tags, see [Using tags to organize your Azure resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
      *
      * @param tags the tags value to set
      * @return the VirtualMachineImageResourceInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImagesImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImagesImpl.java
index eebc0349bb41..43ca651069dd 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImagesImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImagesImpl.java
@@ -110,7 +110,8 @@ public Observable<VirtualMachineImageResource> listOffersAsync(String location,
             public Observable<VirtualMachineImageResourceInner> call(List<VirtualMachineImageResourceInner> innerList) {
                 return Observable.from(innerList);
             }
-        })    .map(new Func1<VirtualMachineImageResourceInner, VirtualMachineImageResource>() {
+        })
+        .map(new Func1<VirtualMachineImageResourceInner, VirtualMachineImageResource>() {
             @Override
             public VirtualMachineImageResource call(VirtualMachineImageResourceInner inner) {
                 return new VirtualMachineImageResourceImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInner.java
index 9bd54cbe4913..0676d90a9a67 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInner.java
@@ -140,7 +140,7 @@ public class VirtualMachineInner extends Resource {
     private List<String> zones;
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -149,7 +149,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineInner object itself.
@@ -160,7 +160,7 @@ public VirtualMachineInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the hardwareProfile value.
+     * Get specifies the hardware settings for the virtual machine.
      *
      * @return the hardwareProfile value
      */
@@ -169,7 +169,7 @@ public HardwareProfile hardwareProfile() {
     }
 
     /**
-     * Set the hardwareProfile value.
+     * Set specifies the hardware settings for the virtual machine.
      *
      * @param hardwareProfile the hardwareProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -180,7 +180,7 @@ public VirtualMachineInner withHardwareProfile(HardwareProfile hardwareProfile)
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -189,7 +189,7 @@ public StorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -200,7 +200,7 @@ public VirtualMachineInner withStorageProfile(StorageProfile storageProfile) {
     }
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machine.
      *
      * @return the osProfile value
      */
@@ -209,7 +209,7 @@ public OSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machine.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -220,7 +220,7 @@ public VirtualMachineInner withOsProfile(OSProfile osProfile) {
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies the network interfaces of the virtual machine.
      *
      * @return the networkProfile value
      */
@@ -229,7 +229,7 @@ public NetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies the network interfaces of the virtual machine.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -240,7 +240,7 @@ public VirtualMachineInner withNetworkProfile(NetworkProfile networkProfile) {
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -249,7 +249,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -260,7 +260,7 @@ public VirtualMachineInner withDiagnosticsProfile(DiagnosticsProfile diagnostics
     }
 
     /**
-     * Get the availabilitySet value.
+     * Get specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @return the availabilitySet value
      */
@@ -269,7 +269,7 @@ public SubResource availabilitySet() {
     }
 
     /**
-     * Set the availabilitySet value.
+     * Set specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @param availabilitySet the availabilitySet value to set
      * @return the VirtualMachineInner object itself.
@@ -280,7 +280,7 @@ public VirtualMachineInner withAvailabilitySet(SubResource availabilitySet) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -289,7 +289,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine instance view.
      *
      * @return the instanceView value
      */
@@ -298,7 +298,7 @@ public VirtualMachineInstanceViewInner instanceView() {
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -307,7 +307,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineInner object itself.
@@ -318,7 +318,7 @@ public VirtualMachineInner withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the vmId value.
+     * Get specifies the VM unique ID which is a 128-bits identifier that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read using platform BIOS commands.
      *
      * @return the vmId value
      */
@@ -327,7 +327,7 @@ public String vmId() {
     }
 
     /**
-     * Get the resources value.
+     * Get the virtual machine child extension resources.
      *
      * @return the resources value
      */
@@ -336,7 +336,7 @@ public List<VirtualMachineExtensionInner> resources() {
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine, if configured.
      *
      * @return the identity value
      */
@@ -345,7 +345,7 @@ public VirtualMachineIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineInner object itself.
@@ -356,7 +356,7 @@ public VirtualMachineInner withIdentity(VirtualMachineIdentity identity) {
     }
 
     /**
-     * Get the zones value.
+     * Get the virtual machine zones.
      *
      * @return the zones value
      */
@@ -365,7 +365,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the virtual machine zones.
      *
      * @param zones the zones value to set
      * @return the VirtualMachineInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInstanceViewInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInstanceViewInner.java
index 0aa073bb21df..711214be6202 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInstanceViewInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineInstanceViewInner.java
@@ -81,7 +81,7 @@ public class VirtualMachineInstanceViewInner {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the platformUpdateDomain value.
+     * Get specifies the update domain of the virtual machine.
      *
      * @return the platformUpdateDomain value
      */
@@ -90,7 +90,7 @@ public Integer platformUpdateDomain() {
     }
 
     /**
-     * Set the platformUpdateDomain value.
+     * Set specifies the update domain of the virtual machine.
      *
      * @param platformUpdateDomain the platformUpdateDomain value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -101,7 +101,7 @@ public VirtualMachineInstanceViewInner withPlatformUpdateDomain(Integer platform
     }
 
     /**
-     * Get the platformFaultDomain value.
+     * Get specifies the fault domain of the virtual machine.
      *
      * @return the platformFaultDomain value
      */
@@ -110,7 +110,7 @@ public Integer platformFaultDomain() {
     }
 
     /**
-     * Set the platformFaultDomain value.
+     * Set specifies the fault domain of the virtual machine.
      *
      * @param platformFaultDomain the platformFaultDomain value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -121,7 +121,7 @@ public VirtualMachineInstanceViewInner withPlatformFaultDomain(Integer platformF
     }
 
     /**
-     * Get the rdpThumbPrint value.
+     * Get the Remote desktop certificate thumbprint.
      *
      * @return the rdpThumbPrint value
      */
@@ -130,7 +130,7 @@ public String rdpThumbPrint() {
     }
 
     /**
-     * Set the rdpThumbPrint value.
+     * Set the Remote desktop certificate thumbprint.
      *
      * @param rdpThumbPrint the rdpThumbPrint value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -141,7 +141,7 @@ public VirtualMachineInstanceViewInner withRdpThumbPrint(String rdpThumbPrint) {
     }
 
     /**
-     * Get the vmAgent value.
+     * Get the VM Agent running on the virtual machine.
      *
      * @return the vmAgent value
      */
@@ -150,7 +150,7 @@ public VirtualMachineAgentInstanceView vmAgent() {
     }
 
     /**
-     * Set the vmAgent value.
+     * Set the VM Agent running on the virtual machine.
      *
      * @param vmAgent the vmAgent value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -161,7 +161,7 @@ public VirtualMachineInstanceViewInner withVmAgent(VirtualMachineAgentInstanceVi
     }
 
     /**
-     * Get the maintenanceRedeployStatus value.
+     * Get the Maintenance Operation status on the virtual machine.
      *
      * @return the maintenanceRedeployStatus value
      */
@@ -170,7 +170,7 @@ public MaintenanceRedeployStatus maintenanceRedeployStatus() {
     }
 
     /**
-     * Set the maintenanceRedeployStatus value.
+     * Set the Maintenance Operation status on the virtual machine.
      *
      * @param maintenanceRedeployStatus the maintenanceRedeployStatus value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -181,7 +181,7 @@ public VirtualMachineInstanceViewInner withMaintenanceRedeployStatus(Maintenance
     }
 
     /**
-     * Get the disks value.
+     * Get the virtual machine disk information.
      *
      * @return the disks value
      */
@@ -190,7 +190,7 @@ public List<DiskInstanceView> disks() {
     }
 
     /**
-     * Set the disks value.
+     * Set the virtual machine disk information.
      *
      * @param disks the disks value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -201,7 +201,7 @@ public VirtualMachineInstanceViewInner withDisks(List<DiskInstanceView> disks) {
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -210,7 +210,7 @@ public List<VirtualMachineExtensionInstanceView> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the extensions information.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -221,7 +221,7 @@ public VirtualMachineInstanceViewInner withExtensions(List<VirtualMachineExtensi
     }
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -230,7 +230,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -241,7 +241,7 @@ public VirtualMachineInstanceViewInner withBootDiagnostics(BootDiagnosticsInstan
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -250,7 +250,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineRunCommandsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineRunCommandsInner.java
index 7f45834d922c..80fda17139df 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineRunCommandsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineRunCommandsInner.java
@@ -151,7 +151,7 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Servi
     /**
      * Lists all available run commands for a subscription in a location.
      *
-    ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> * @param location The location upon which run commands is queried.
+    ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> * @param location The location upon which run commands is queried.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RunCommandDocumentBaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -170,7 +170,7 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> listSingle
                 @Override
                 public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<RunCommandDocumentBaseInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -179,9 +179,9 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<RunCommandDocumentBaseInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<RunCommandDocumentBaseInner>>() { }.getType())
+    private ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RunCommandDocumentBaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RunCommandDocumentBaseInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -353,7 +353,7 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Servi
     /**
      * Lists all available run commands for a subscription in a location.
      *
-    ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RunCommandDocumentBaseInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -367,7 +367,7 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> listNextSi
                 @Override
                 public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<RunCommandDocumentBaseInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -376,9 +376,9 @@ public Observable<ServiceResponse<Page<RunCommandDocumentBaseInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<RunCommandDocumentBaseInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<RunCommandDocumentBaseInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<RunCommandDocumentBaseInner>>() { }.getType())
+    private ServiceResponse<PageImpl<RunCommandDocumentBaseInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<RunCommandDocumentBaseInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<RunCommandDocumentBaseInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionInner.java
index 281b4e080fe5..691c2f5180bf 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionInner.java
@@ -79,7 +79,7 @@ public class VirtualMachineScaleSetExtensionInner extends SubResourceReadOnly {
     private String provisioningState;
 
     /**
-     * Get the name value.
+     * Get the name of the extension.
      *
      * @return the name value
      */
@@ -88,7 +88,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the extension.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -99,7 +99,7 @@ public VirtualMachineScaleSetExtensionInner withName(String name) {
     }
 
     /**
-     * Get the forceUpdateTag value.
+     * Get if a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -108,7 +108,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set if a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -119,7 +119,7 @@ public VirtualMachineScaleSetExtensionInner withForceUpdateTag(String forceUpdat
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -128,7 +128,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -139,7 +139,7 @@ public VirtualMachineScaleSetExtensionInner withPublisher(String publisher) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -148,7 +148,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -159,7 +159,7 @@ public VirtualMachineScaleSetExtensionInner withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -168,7 +168,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -179,7 +179,7 @@ public VirtualMachineScaleSetExtensionInner withTypeHandlerVersion(String typeHa
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -188,7 +188,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -199,7 +199,7 @@ public VirtualMachineScaleSetExtensionInner withAutoUpgradeMinorVersion(Boolean
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -208,7 +208,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -219,7 +219,7 @@ public VirtualMachineScaleSetExtensionInner withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -228,7 +228,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -239,7 +239,7 @@ public VirtualMachineScaleSetExtensionInner withProtectedSettings(Object protect
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionsInner.java
index 56a18ed6a475..71d43eac1f32 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetExtensionsInner.java
@@ -716,8 +716,8 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> c
     /**
      * Gets a list of all extensions in a VM scale set.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> * @param resourceGroupName The name of the resource group.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> * @param vmScaleSetName The name of the VM scale set containing the extension.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> * @param vmScaleSetName The name of the VM scale set containing the extension.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetExtensionInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -739,7 +739,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> l
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -748,9 +748,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> c
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetExtensionInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetExtensionInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetExtensionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetExtensionInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -836,7 +836,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> c
     /**
      * Gets a list of all extensions in a VM scale set.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetExtensionInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -850,7 +850,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> l
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -859,9 +859,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetExtensionInner>>> c
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetExtensionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetExtensionInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetExtensionInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetExtensionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetExtensionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetExtensionInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInner.java
index e3bfa3c81da4..02358957991c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInner.java
@@ -92,7 +92,7 @@ public class VirtualMachineScaleSetInner extends Resource {
     private List<String> zones;
 
     /**
-     * Get the sku value.
+     * Get the virtual machine scale set sku.
      *
      * @return the sku value
      */
@@ -101,7 +101,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the virtual machine scale set sku.
      *
      * @param sku the sku value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -112,7 +112,7 @@ public VirtualMachineScaleSetInner withSku(Sku sku) {
     }
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -121,7 +121,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -132,7 +132,7 @@ public VirtualMachineScaleSetInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the upgradePolicy value.
+     * Get the upgrade policy.
      *
      * @return the upgradePolicy value
      */
@@ -141,7 +141,7 @@ public UpgradePolicy upgradePolicy() {
     }
 
     /**
-     * Set the upgradePolicy value.
+     * Set the upgrade policy.
      *
      * @param upgradePolicy the upgradePolicy value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -152,7 +152,7 @@ public VirtualMachineScaleSetInner withUpgradePolicy(UpgradePolicy upgradePolicy
     }
 
     /**
-     * Get the virtualMachineProfile value.
+     * Get the virtual machine profile.
      *
      * @return the virtualMachineProfile value
      */
@@ -161,7 +161,7 @@ public VirtualMachineScaleSetVMProfile virtualMachineProfile() {
     }
 
     /**
-     * Set the virtualMachineProfile value.
+     * Set the virtual machine profile.
      *
      * @param virtualMachineProfile the virtualMachineProfile value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -172,7 +172,7 @@ public VirtualMachineScaleSetInner withVirtualMachineProfile(VirtualMachineScale
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -181,7 +181,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the overprovision value.
+     * Get specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @return the overprovision value
      */
@@ -190,7 +190,7 @@ public Boolean overprovision() {
     }
 
     /**
-     * Set the overprovision value.
+     * Set specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @param overprovision the overprovision value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -201,7 +201,7 @@ public VirtualMachineScaleSetInner withOverprovision(Boolean overprovision) {
     }
 
     /**
-     * Get the uniqueId value.
+     * Get specifies the ID which uniquely identifies a Virtual Machine Scale Set.
      *
      * @return the uniqueId value
      */
@@ -210,7 +210,7 @@ public String uniqueId() {
     }
 
     /**
-     * Get the singlePlacementGroup value.
+     * Get when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @return the singlePlacementGroup value
      */
@@ -219,7 +219,7 @@ public Boolean singlePlacementGroup() {
     }
 
     /**
-     * Set the singlePlacementGroup value.
+     * Set when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @param singlePlacementGroup the singlePlacementGroup value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -230,7 +230,7 @@ public VirtualMachineScaleSetInner withSinglePlacementGroup(Boolean singlePlacem
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine scale set, if configured.
      *
      * @return the identity value
      */
@@ -239,7 +239,7 @@ public VirtualMachineScaleSetIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine scale set, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -250,7 +250,7 @@ public VirtualMachineScaleSetInner withIdentity(VirtualMachineScaleSetIdentity i
     }
 
     /**
-     * Get the zones value.
+     * Get the virtual machine scale set zones.
      *
      * @return the zones value
      */
@@ -259,7 +259,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the virtual machine scale set zones.
      *
      * @param zones the zones value to set
      * @return the VirtualMachineScaleSetInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInstanceViewInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInstanceViewInner.java
index 3e37fdfe9bca..55aa73351faf 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInstanceViewInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetInstanceViewInner.java
@@ -37,7 +37,7 @@ public class VirtualMachineScaleSetInstanceViewInner {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the virtualMachine value.
+     * Get the instance view status summary for the virtual machine scale set.
      *
      * @return the virtualMachine value
      */
@@ -46,7 +46,7 @@ public VirtualMachineScaleSetInstanceViewStatusesSummary virtualMachine() {
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -55,7 +55,7 @@ public List<VirtualMachineScaleSetVMExtensionsSummary> extensions() {
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -64,7 +64,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineScaleSetInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetSkuInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetSkuInner.java
index 26845f6d289b..3e24049d2993 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetSkuInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetSkuInner.java
@@ -35,7 +35,7 @@ public class VirtualMachineScaleSetSkuInner {
     private VirtualMachineScaleSetSkuCapacity capacity;
 
     /**
-     * Get the resourceType value.
+     * Get the type of resource the sku applies to.
      *
      * @return the resourceType value
      */
@@ -44,7 +44,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the sku value.
+     * Get the Sku.
      *
      * @return the sku value
      */
@@ -53,7 +53,7 @@ public Sku sku() {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMImpl.java
index 5cbd48a71762..58e17c25108c 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMImpl.java
@@ -14,7 +14,7 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.compute.v2017_03_30.DiagnosticsProfile;
 import com.microsoft.azure.management.compute.v2017_03_30.HardwareProfile;
-import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineInstanceView;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineScaleSetVMInstanceView;
 import com.microsoft.azure.management.compute.v2017_03_30.NetworkProfile;
 import com.microsoft.azure.management.compute.v2017_03_30.OSProfile;
 import com.microsoft.azure.management.compute.v2017_03_30.Plan;
@@ -78,10 +78,10 @@ public String instanceId() {
     }
 
     @Override
-    public VirtualMachineInstanceView instanceView() {
-        VirtualMachineInstanceViewInner inner = this.inner().instanceView();
+    public VirtualMachineScaleSetVMInstanceView instanceView() {
+        VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
         if (inner != null) {
-            return  new VirtualMachineInstanceViewImpl(inner, manager());
+            return  new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
         } else {
             return null;
         }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInner.java
index 4e30f88c9eaf..2feeb90ec6e9 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInner.java
@@ -55,7 +55,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
      * The virtual machine instance view.
      */
     @JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
-    private VirtualMachineInstanceViewInner instanceView;
+    private VirtualMachineScaleSetVMInstanceViewInner instanceView;
 
     /**
      * Specifies the hardware settings for the virtual machine.
@@ -145,7 +145,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
     private List<VirtualMachineExtensionInner> resources;
 
     /**
-     * Get the instanceId value.
+     * Get the virtual machine instance ID.
      *
      * @return the instanceId value
      */
@@ -154,7 +154,7 @@ public String instanceId() {
     }
 
     /**
-     * Get the sku value.
+     * Get the virtual machine SKU.
      *
      * @return the sku value
      */
@@ -163,7 +163,7 @@ public Sku sku() {
     }
 
     /**
-     * Get the latestModelApplied value.
+     * Get specifies whether the latest model has been applied to the virtual machine.
      *
      * @return the latestModelApplied value
      */
@@ -172,7 +172,7 @@ public Boolean latestModelApplied() {
     }
 
     /**
-     * Get the vmId value.
+     * Get azure VM unique ID.
      *
      * @return the vmId value
      */
@@ -181,16 +181,16 @@ public String vmId() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine instance view.
      *
      * @return the instanceView value
      */
-    public VirtualMachineInstanceViewInner instanceView() {
+    public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
         return this.instanceView;
     }
 
     /**
-     * Get the hardwareProfile value.
+     * Get specifies the hardware settings for the virtual machine.
      *
      * @return the hardwareProfile value
      */
@@ -199,7 +199,7 @@ public HardwareProfile hardwareProfile() {
     }
 
     /**
-     * Set the hardwareProfile value.
+     * Set specifies the hardware settings for the virtual machine.
      *
      * @param hardwareProfile the hardwareProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -210,7 +210,7 @@ public VirtualMachineScaleSetVMInner withHardwareProfile(HardwareProfile hardwar
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -219,7 +219,7 @@ public StorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -230,7 +230,7 @@ public VirtualMachineScaleSetVMInner withStorageProfile(StorageProfile storagePr
     }
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machine.
      *
      * @return the osProfile value
      */
@@ -239,7 +239,7 @@ public OSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machine.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -250,7 +250,7 @@ public VirtualMachineScaleSetVMInner withOsProfile(OSProfile osProfile) {
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies the network interfaces of the virtual machine.
      *
      * @return the networkProfile value
      */
@@ -259,7 +259,7 @@ public NetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies the network interfaces of the virtual machine.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -270,7 +270,7 @@ public VirtualMachineScaleSetVMInner withNetworkProfile(NetworkProfile networkPr
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -279,7 +279,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -290,7 +290,7 @@ public VirtualMachineScaleSetVMInner withDiagnosticsProfile(DiagnosticsProfile d
     }
 
     /**
-     * Get the availabilitySet value.
+     * Get specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @return the availabilitySet value
      */
@@ -299,7 +299,7 @@ public SubResource availabilitySet() {
     }
 
     /**
-     * Set the availabilitySet value.
+     * Set specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @param availabilitySet the availabilitySet value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -310,7 +310,7 @@ public VirtualMachineScaleSetVMInner withAvailabilitySet(SubResource availabilit
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -319,7 +319,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -328,7 +328,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -339,7 +339,7 @@ public VirtualMachineScaleSetVMInner withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -348,7 +348,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -359,7 +359,7 @@ public VirtualMachineScaleSetVMInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the resources value.
+     * Get the virtual machine child extension resources.
      *
      * @return the resources value
      */
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInstanceViewInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
index a8c58c0dbe49..e562231ccc11 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
@@ -88,7 +88,7 @@ public class VirtualMachineScaleSetVMInstanceViewInner {
     private String placementGroupId;
 
     /**
-     * Get the platformUpdateDomain value.
+     * Get the Update Domain count.
      *
      * @return the platformUpdateDomain value
      */
@@ -97,7 +97,7 @@ public Integer platformUpdateDomain() {
     }
 
     /**
-     * Set the platformUpdateDomain value.
+     * Set the Update Domain count.
      *
      * @param platformUpdateDomain the platformUpdateDomain value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -108,7 +108,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withPlatformUpdateDomain(Intege
     }
 
     /**
-     * Get the platformFaultDomain value.
+     * Get the Fault Domain count.
      *
      * @return the platformFaultDomain value
      */
@@ -117,7 +117,7 @@ public Integer platformFaultDomain() {
     }
 
     /**
-     * Set the platformFaultDomain value.
+     * Set the Fault Domain count.
      *
      * @param platformFaultDomain the platformFaultDomain value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -128,7 +128,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withPlatformFaultDomain(Integer
     }
 
     /**
-     * Get the rdpThumbPrint value.
+     * Get the Remote desktop certificate thumbprint.
      *
      * @return the rdpThumbPrint value
      */
@@ -137,7 +137,7 @@ public String rdpThumbPrint() {
     }
 
     /**
-     * Set the rdpThumbPrint value.
+     * Set the Remote desktop certificate thumbprint.
      *
      * @param rdpThumbPrint the rdpThumbPrint value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -148,7 +148,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withRdpThumbPrint(String rdpThu
     }
 
     /**
-     * Get the vmAgent value.
+     * Get the VM Agent running on the virtual machine.
      *
      * @return the vmAgent value
      */
@@ -157,7 +157,7 @@ public VirtualMachineAgentInstanceView vmAgent() {
     }
 
     /**
-     * Set the vmAgent value.
+     * Set the VM Agent running on the virtual machine.
      *
      * @param vmAgent the vmAgent value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -168,7 +168,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withVmAgent(VirtualMachineAgent
     }
 
     /**
-     * Get the disks value.
+     * Get the disks information.
      *
      * @return the disks value
      */
@@ -177,7 +177,7 @@ public List<DiskInstanceView> disks() {
     }
 
     /**
-     * Set the disks value.
+     * Set the disks information.
      *
      * @param disks the disks value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -188,7 +188,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withDisks(List<DiskInstanceView
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -197,7 +197,7 @@ public List<VirtualMachineExtensionInstanceView> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the extensions information.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -208,7 +208,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withExtensions(List<VirtualMach
     }
 
     /**
-     * Get the vmHealth value.
+     * Get the health status for the VM.
      *
      * @return the vmHealth value
      */
@@ -217,7 +217,7 @@ public VirtualMachineHealthStatus vmHealth() {
     }
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -226,7 +226,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -237,7 +237,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withBootDiagnostics(BootDiagnos
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -246,7 +246,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -257,7 +257,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withStatuses(List<InstanceViewS
     }
 
     /**
-     * Get the placementGroupId value.
+     * Get the placement group in which the VM is running. If the VM is deallocated it will not have a placementGroupId.
      *
      * @return the placementGroupId value
      */
@@ -266,7 +266,7 @@ public String placementGroupId() {
     }
 
     /**
-     * Set the placementGroupId value.
+     * Set the placement group in which the VM is running. If the VM is deallocated it will not have a placementGroupId.
      *
      * @param placementGroupId the placementGroupId value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMsInner.java
index 2f421f45da54..2517c105061b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetVMsInner.java
@@ -1110,7 +1110,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> listSing
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetVMInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1215,11 +1215,11 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Ser
     /**
      * Gets a list of all virtual machines in a VM scale sets.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param resourceGroupName The name of the resource group.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param virtualMachineScaleSetName The name of the VM scale set.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param filter The filter to apply to the operation.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param select The list parameters.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param expand The expand expression to apply to the operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param virtualMachineScaleSetName The name of the VM scale set.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param filter The filter to apply to the operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param select The list parameters.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param expand The expand expression to apply to the operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetVMInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1241,7 +1241,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> listSing
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetVMInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1250,9 +1250,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Res
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetVMInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetVMInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetVMInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetVMInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1848,7 +1848,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Ser
     /**
      * Gets a list of all virtual machines in a VM scale sets.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetVMInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1862,7 +1862,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> listNext
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetVMInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1871,9 +1871,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetVMInner>>> call(Res
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetVMInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetVMInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetVMInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetVMInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetVMInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetVMInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetsInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetsInner.java
index 0f725f5dcf3e..519412948b99 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetsInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineScaleSetsInner.java
@@ -1448,7 +1448,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Servi
     /**
      * Gets a list of all VM scale sets under a resource group.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1467,7 +1467,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> listByReso
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> result = listByResourceGroupDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> result = listByResourceGroupDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1476,9 +1476,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1574,7 +1574,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> listSingle
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1583,9 +1583,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1674,8 +1674,8 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Se
     /**
      * Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> * @param resourceGroupName The name of the resource group.
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> * @param vmScaleSetName The name of the VM scale set.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> * @param vmScaleSetName The name of the VM scale set.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetSkuInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1697,7 +1697,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> listSku
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> result = listSkusDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> result = listSkusDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1706,9 +1706,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Re
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> listSkusDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetSkuInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> listSkusDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetSkuInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -3615,7 +3615,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Servi
     /**
      * Gets a list of all VM scale sets under a resource group.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -3629,7 +3629,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> listByReso
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> result = listByResourceGroupNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> result = listByResourceGroupNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -3638,9 +3638,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -3726,7 +3726,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Servi
     /**
      * Gets a list of all VM Scale Sets in the subscription, regardless of the associated resource group. Use nextLink property in the response to get the next page of VM Scale Sets. Do this till nextLink is null to fetch all the VM Scale Sets.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -3740,7 +3740,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> listNextSi
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -3749,9 +3749,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetInner>>> call(Respo
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -3837,7 +3837,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Se
     /**
      * Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
      *
-    ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineScaleSetSkuInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -3851,7 +3851,7 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> listSku
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> result = listSkusNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> result = listSkusNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -3860,9 +3860,9 @@ public Observable<ServiceResponse<Page<VirtualMachineScaleSetSkuInner>>> call(Re
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineScaleSetSkuInner>> listSkusNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineScaleSetSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineScaleSetSkuInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineScaleSetSkuInner>> listSkusNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineScaleSetSkuInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineScaleSetSkuInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizeInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizeInner.java
index f171e8081ef4..068c94a4553d 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizeInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizeInner.java
@@ -52,7 +52,7 @@ public class VirtualMachineSizeInner {
     private Integer maxDataDiskCount;
 
     /**
-     * Get the name value.
+     * Get the name of the virtual machine size.
      *
      * @return the name value
      */
@@ -61,7 +61,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the virtual machine size.
      *
      * @param name the name value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -72,7 +72,7 @@ public VirtualMachineSizeInner withName(String name) {
     }
 
     /**
-     * Get the numberOfCores value.
+     * Get the number of cores supported by the virtual machine size.
      *
      * @return the numberOfCores value
      */
@@ -81,7 +81,7 @@ public Integer numberOfCores() {
     }
 
     /**
-     * Set the numberOfCores value.
+     * Set the number of cores supported by the virtual machine size.
      *
      * @param numberOfCores the numberOfCores value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -92,7 +92,7 @@ public VirtualMachineSizeInner withNumberOfCores(Integer numberOfCores) {
     }
 
     /**
-     * Get the osDiskSizeInMB value.
+     * Get the OS disk size, in MB, allowed by the virtual machine size.
      *
      * @return the osDiskSizeInMB value
      */
@@ -101,7 +101,7 @@ public Integer osDiskSizeInMB() {
     }
 
     /**
-     * Set the osDiskSizeInMB value.
+     * Set the OS disk size, in MB, allowed by the virtual machine size.
      *
      * @param osDiskSizeInMB the osDiskSizeInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -112,7 +112,7 @@ public VirtualMachineSizeInner withOsDiskSizeInMB(Integer osDiskSizeInMB) {
     }
 
     /**
-     * Get the resourceDiskSizeInMB value.
+     * Get the resource disk size, in MB, allowed by the virtual machine size.
      *
      * @return the resourceDiskSizeInMB value
      */
@@ -121,7 +121,7 @@ public Integer resourceDiskSizeInMB() {
     }
 
     /**
-     * Set the resourceDiskSizeInMB value.
+     * Set the resource disk size, in MB, allowed by the virtual machine size.
      *
      * @param resourceDiskSizeInMB the resourceDiskSizeInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -132,7 +132,7 @@ public VirtualMachineSizeInner withResourceDiskSizeInMB(Integer resourceDiskSize
     }
 
     /**
-     * Get the memoryInMB value.
+     * Get the amount of memory, in MB, supported by the virtual machine size.
      *
      * @return the memoryInMB value
      */
@@ -141,7 +141,7 @@ public Integer memoryInMB() {
     }
 
     /**
-     * Set the memoryInMB value.
+     * Set the amount of memory, in MB, supported by the virtual machine size.
      *
      * @param memoryInMB the memoryInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -152,7 +152,7 @@ public VirtualMachineSizeInner withMemoryInMB(Integer memoryInMB) {
     }
 
     /**
-     * Get the maxDataDiskCount value.
+     * Get the maximum number of data disks that can be attached to the virtual machine size.
      *
      * @return the maxDataDiskCount value
      */
@@ -161,7 +161,7 @@ public Integer maxDataDiskCount() {
     }
 
     /**
-     * Set the maxDataDiskCount value.
+     * Set the maximum number of data disks that can be attached to the virtual machine size.
      *
      * @param maxDataDiskCount the maxDataDiskCount value to set
      * @return the VirtualMachineSizeInner object itself.
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizesInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizesInner.java
index e55a8aed3604..e72b2aa6ad4b 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizesInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineSizesInner.java
@@ -121,7 +121,7 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> listWithServic
                 @Override
                 public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<VirtualMachineSizeInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl1<VirtualMachineSizeInner>> result = listDelegate(response);
                         List<VirtualMachineSizeInner> items = null;
                         if (result.body() != null) {
                             items = result.body().items();
@@ -135,9 +135,9 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<VirtualMachineSizeInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<VirtualMachineSizeInner>>() { }.getType())
+    private ServiceResponse<PageImpl1<VirtualMachineSizeInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<VirtualMachineSizeInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesImpl.java
new file mode 100644
index 000000000000..67930ac13269
--- /dev/null
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesImpl.java
@@ -0,0 +1,313 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.compute.v2017_03_30.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachines;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachine;
+import rx.Observable;
+import rx.Completable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import com.microsoft.azure.arm.resources.ResourceUtilsCore;
+import com.microsoft.azure.arm.utils.RXMapper;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineCaptureResult;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineInstanceView;
+import com.microsoft.azure.management.compute.v2017_03_30.OperationStatusResponse;
+import com.microsoft.azure.management.compute.v2017_03_30.RunCommandResult;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineCaptureParameters;
+import com.microsoft.azure.management.compute.v2017_03_30.RunCommandInput;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineExtensionsListResult;
+import java.util.List;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineVirtualMachineSize;
+
+class VirtualMachinesImpl extends GroupableResourcesCoreImpl<VirtualMachine, VirtualMachineImpl, VirtualMachineInner, VirtualMachinesInner, ComputeManager>  implements VirtualMachines {
+    protected VirtualMachinesImpl(ComputeManager manager) {
+        super(manager.inner().virtualMachines(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualMachineInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualMachinesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualMachinesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Observable.empty();
+        }
+        Collection<Observable<String>> observables = new ArrayList<>();
+        for (String id : ids) {
+            final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id);
+            final String name = ResourceUtilsCore.nameFromResourceId(id);
+            Observable<String> o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id);
+            observables.add(o);
+        }
+        return Observable.mergeDelayError(observables);
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(String...ids) {
+        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public void deleteByIds(Collection<String> ids) {
+        if (ids != null && !ids.isEmpty()) {
+            this.deleteByIdsAsync(ids).toBlocking().last();
+        }
+    }
+
+    @Override
+    public void deleteByIds(String...ids) {
+        this.deleteByIds(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public PagedList<VirtualMachine> listByResourceGroup(String resourceGroupName) {
+        VirtualMachinesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualMachine> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualMachinesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
+            @Override
+            public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
+            @Override
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualMachine> list() {
+        VirtualMachinesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualMachine> listAsync() {
+        VirtualMachinesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
+            @Override
+            public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
+            @Override
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualMachineImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
+        VirtualMachinesInner client = this.inner();
+        return client.captureAsync(resourceGroupName, vmName, parameters)
+        .map(new Func1<VirtualMachineCaptureResultInner, VirtualMachineCaptureResult>() {
+            @Override
+            public VirtualMachineCaptureResult call(VirtualMachineCaptureResultInner inner) {
+                return new VirtualMachineCaptureResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualMachineInstanceView> instanceViewAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.instanceViewAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineInstanceViewInner, VirtualMachineInstanceView>() {
+            @Override
+            public VirtualMachineInstanceView call(VirtualMachineInstanceViewInner inner) {
+                return new VirtualMachineInstanceViewImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> convertToManagedDisksAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.convertToManagedDisksAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> deallocateAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.deallocateAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> generalizeAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.generalizeAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> powerOffAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.powerOffAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> restartAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.restartAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> startAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.startAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> redeployAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.redeployAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> performMaintenanceAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.performMaintenanceAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<RunCommandResult> runCommandAsync(String resourceGroupName, String vmName, RunCommandInput parameters) {
+        VirtualMachinesInner client = this.inner();
+        return client.runCommandAsync(resourceGroupName, vmName, parameters)
+        .map(new Func1<RunCommandResultInner, RunCommandResult>() {
+            @Override
+            public RunCommandResult call(RunCommandResultInner inner) {
+                return new RunCommandResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected VirtualMachineImpl wrapModel(VirtualMachineInner inner) {
+        return  new VirtualMachineImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualMachineImpl wrapModel(String name) {
+        return new VirtualMachineImpl(name, new VirtualMachineInner(), this.manager());
+    }
+
+    private VirtualMachineVirtualMachineSizeImpl wrapVirtualMachineVirtualMachineSizeModel(VirtualMachineSizeInner inner) {
+        return  new VirtualMachineVirtualMachineSizeImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VirtualMachineExtensionsListResult> getExtensionsAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.getExtensionsAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineExtensionsListResultInner, VirtualMachineExtensionsListResult>() {
+            @Override
+            public VirtualMachineExtensionsListResult call(VirtualMachineExtensionsListResultInner inner) {
+                return new VirtualMachineExtensionsListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualMachineVirtualMachineSize> listAvailableSizesAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.listAvailableSizesAsync(resourceGroupName, vmName)
+        .flatMap(new Func1<List<VirtualMachineSizeInner>, Observable<VirtualMachineSizeInner>>() {
+            @Override
+            public Observable<VirtualMachineSizeInner> call(List<VirtualMachineSizeInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<VirtualMachineSizeInner, VirtualMachineVirtualMachineSize>() {
+            @Override
+            public VirtualMachineVirtualMachineSize call(VirtualMachineSizeInner inner) {
+                return wrapVirtualMachineVirtualMachineSizeModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesInner.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesInner.java
index 434379c14891..71036e8f6c72 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesInner.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachinesInner.java
@@ -1599,7 +1599,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceRespon
     /**
      * Lists all of the virtual machines in the specified resource group. Use the nextLink property in the response to get the next page of virtual machines.
      *
-    ServiceResponse<PageImpl1<VirtualMachineInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<VirtualMachineInner>> * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -1618,7 +1618,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByResourceGrou
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listByResourceGroupDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listByResourceGroupDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1627,9 +1627,9 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1725,7 +1725,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> listSinglePageAsyn
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1734,9 +1734,9 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -1811,7 +1811,7 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> listAvailableS
                 @Override
                 public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<VirtualMachineSizeInner>> result = listAvailableSizesDelegate(response);
+                        ServiceResponse<PageImpl1<VirtualMachineSizeInner>> result = listAvailableSizesDelegate(response);
                         List<VirtualMachineSizeInner> items = null;
                         if (result.body() != null) {
                             items = result.body().items();
@@ -1825,9 +1825,9 @@ public Observable<ServiceResponse<List<VirtualMachineSizeInner>>> call(Response<
             });
     }
 
-    private ServiceResponse<PageImpl<VirtualMachineSizeInner>> listAvailableSizesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<VirtualMachineSizeInner>>() { }.getType())
+    private ServiceResponse<PageImpl1<VirtualMachineSizeInner>> listAvailableSizesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineSizeInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<VirtualMachineSizeInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -2865,7 +2865,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceRespon
     /**
      * Lists all of the virtual machines in the specified resource group. Use the nextLink property in the response to get the next page of virtual machines.
      *
-    ServiceResponse<PageImpl1<VirtualMachineInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -2879,7 +2879,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByResourceGrou
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listByResourceGroupNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listByResourceGroupNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2888,9 +2888,9 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -2976,7 +2976,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceRespon
     /**
      * Lists all of the virtual machines in the specified subscription. Use the nextLink property in the response to get the next page of virtual machines.
      *
-    ServiceResponse<PageImpl1<VirtualMachineInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+    ServiceResponse<PageImpl<VirtualMachineInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualMachineInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -2990,7 +2990,7 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> listNextSinglePage
                 @Override
                 public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listNextDelegate(response);
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listNextDelegate(response);
                         return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2999,9 +2999,9 @@ public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<VirtualMachineInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl1<VirtualMachineInner>>() { }.getType())
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<VirtualMachineInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<VirtualMachineInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
diff --git a/compute/resource-manager/v2017_09_01/pom.xml b/compute/resource-manager/v2017_09_01/pom.xml
index 887853aa08d7..43c6de24ef1c 100644
--- a/compute/resource-manager/v2017_09_01/pom.xml
+++ b/compute/resource-manager/v2017_09_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.compute.v2017_09_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-compute</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Compute Management</name>
-    <description>This package contains Microsoft Compute Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.compute.v2017_09_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-compute</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Compute Management</name>
+    <description>This package contains Microsoft Compute Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapabilities.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapabilities.java
index 01c94ba90cea..21db00ed415e 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapabilities.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapabilities.java
@@ -27,7 +27,7 @@ public class ResourceSkuCapabilities {
     private String value;
 
     /**
-     * Get the name value.
+     * Get an invariant to describe the feature.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public String name() {
     }
 
     /**
-     * Get the value value.
+     * Get an invariant if the feature is measured by quantity.
      *
      * @return the value value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapacity.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapacity.java
index 0a164a574154..bae4e0326b52 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapacity.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapacity.java
@@ -40,7 +40,7 @@ public class ResourceSkuCapacity {
     private ResourceSkuCapacityScaleType scaleType;
 
     /**
-     * Get the minimum value.
+     * Get the minimum capacity.
      *
      * @return the minimum value
      */
@@ -49,7 +49,7 @@ public Long minimum() {
     }
 
     /**
-     * Get the maximum value.
+     * Get the maximum capacity that can be set.
      *
      * @return the maximum value
      */
@@ -58,7 +58,7 @@ public Long maximum() {
     }
 
     /**
-     * Get the defaultProperty value.
+     * Get the default capacity.
      *
      * @return the defaultProperty value
      */
@@ -67,7 +67,7 @@ public Long defaultProperty() {
     }
 
     /**
-     * Get the scaleType value.
+     * Get the scale type applicable to the sku. Possible values include: 'Automatic', 'Manual', 'None'.
      *
      * @return the scaleType value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCosts.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCosts.java
index 65f7e352fdbc..ea00d71771c2 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCosts.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCosts.java
@@ -33,7 +33,7 @@ public class ResourceSkuCosts {
     private String extendedUnit;
 
     /**
-     * Get the meterID value.
+     * Get used for querying price from commerce.
      *
      * @return the meterID value
      */
@@ -42,7 +42,7 @@ public String meterID() {
     }
 
     /**
-     * Get the quantity value.
+     * Get the multiplier is needed to extend the base metered cost.
      *
      * @return the quantity value
      */
@@ -51,7 +51,7 @@ public Long quantity() {
     }
 
     /**
-     * Get the extendedUnit value.
+     * Get an invariant to show the extended unit.
      *
      * @return the extendedUnit value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuLocationInfo.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuLocationInfo.java
index 1e205d572573..4c3a86ebb0e4 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuLocationInfo.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuLocationInfo.java
@@ -28,7 +28,7 @@ public class ResourceSkuLocationInfo {
     private List<String> zones;
 
     /**
-     * Get the location value.
+     * Get location of the SKU.
      *
      * @return the location value
      */
@@ -37,7 +37,7 @@ public String location() {
     }
 
     /**
-     * Get the zones value.
+     * Get list of availability zones where the SKU is supported.
      *
      * @return the zones value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictionInfo.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictionInfo.java
index e539c9d6b63c..ea3f4b180536 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictionInfo.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictionInfo.java
@@ -28,7 +28,7 @@ public class ResourceSkuRestrictionInfo {
     private List<String> zones;
 
     /**
-     * Get the locations value.
+     * Get locations where the SKU is restricted.
      *
      * @return the locations value
      */
@@ -37,7 +37,7 @@ public List<String> locations() {
     }
 
     /**
-     * Get the zones value.
+     * Get list of availability zones where the SKU is restricted.
      *
      * @return the zones value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictions.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictions.java
index 6a32797609df..e7a4794c43b8 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictions.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictions.java
@@ -42,7 +42,7 @@ public class ResourceSkuRestrictions {
     private ResourceSkuRestrictionsReasonCode reasonCode;
 
     /**
-     * Get the type value.
+     * Get the type of restrictions. Possible values include: 'Location', 'Zone'.
      *
      * @return the type value
      */
@@ -51,7 +51,7 @@ public ResourceSkuRestrictionsType type() {
     }
 
     /**
-     * Get the values value.
+     * Get the value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted.
      *
      * @return the values value
      */
@@ -60,7 +60,7 @@ public List<String> values() {
     }
 
     /**
-     * Get the restrictionInfo value.
+     * Get the information about the restriction where the SKU cannot be used.
      *
      * @return the restrictionInfo value
      */
@@ -69,7 +69,7 @@ public ResourceSkuRestrictionInfo restrictionInfo() {
     }
 
     /**
-     * Get the reasonCode value.
+     * Get the reason for restriction. Possible values include: 'QuotaId', 'NotAvailableForSubscription'.
      *
      * @return the reasonCode value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkuInner.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkuInner.java
index cc07679eb97e..da5b155234ac 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkuInner.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkuInner.java
@@ -103,7 +103,7 @@ public class ResourceSkuInner {
     private List<ResourceSkuRestrictions> restrictions;
 
     /**
-     * Get the resourceType value.
+     * Get the type of resource the SKU applies to.
      *
      * @return the resourceType value
      */
@@ -112,7 +112,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the name value.
+     * Get the name of SKU.
      *
      * @return the name value
      */
@@ -121,7 +121,7 @@ public String name() {
     }
 
     /**
-     * Get the tier value.
+     * Get specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @return the tier value
      */
@@ -130,7 +130,7 @@ public String tier() {
     }
 
     /**
-     * Get the size value.
+     * Get the Size of the SKU.
      *
      * @return the size value
      */
@@ -139,7 +139,7 @@ public String size() {
     }
 
     /**
-     * Get the family value.
+     * Get the Family of this particular SKU.
      *
      * @return the family value
      */
@@ -148,7 +148,7 @@ public String family() {
     }
 
     /**
-     * Get the kind value.
+     * Get the Kind of resources that are supported in this SKU.
      *
      * @return the kind value
      */
@@ -157,7 +157,7 @@ public String kind() {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
@@ -166,7 +166,7 @@ public ResourceSkuCapacity capacity() {
     }
 
     /**
-     * Get the locations value.
+     * Get the set of locations that the SKU is available.
      *
      * @return the locations value
      */
@@ -175,7 +175,7 @@ public List<String> locations() {
     }
 
     /**
-     * Get the locationInfo value.
+     * Get a list of locations and availability zones in those locations where the SKU is available.
      *
      * @return the locationInfo value
      */
@@ -184,7 +184,7 @@ public List<ResourceSkuLocationInfo> locationInfo() {
     }
 
     /**
-     * Get the apiVersions value.
+     * Get the api versions that support this SKU.
      *
      * @return the apiVersions value
      */
@@ -193,7 +193,7 @@ public List<String> apiVersions() {
     }
 
     /**
-     * Get the costs value.
+     * Get metadata for retrieving price info.
      *
      * @return the costs value
      */
@@ -202,7 +202,7 @@ public List<ResourceSkuCosts> costs() {
     }
 
     /**
-     * Get the capabilities value.
+     * Get a name value pair to describe the capability.
      *
      * @return the capabilities value
      */
@@ -211,7 +211,7 @@ public List<ResourceSkuCapabilities> capabilities() {
     }
 
     /**
-     * Get the restrictions value.
+     * Get the restrictions because of which SKU cannot be used. This is empty if there are no restrictions.
      *
      * @return the restrictions value
      */
diff --git a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkusImpl.java b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkusImpl.java
index a9f341529dea..68d8220ac874 100644
--- a/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkusImpl.java
+++ b/compute/resource-manager/v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkusImpl.java
@@ -37,7 +37,8 @@ public Observable<ResourceSku> listAsync() {
             public Iterable<ResourceSkuInner> call(Page<ResourceSkuInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<ResourceSkuInner, ResourceSku>() {
+        })
+        .map(new Func1<ResourceSkuInner, ResourceSku>() {
             @Override
             public ResourceSku call(ResourceSkuInner inner) {
                 return new ResourceSkuImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_12_01/pom.xml b/compute/resource-manager/v2017_12_01/pom.xml
index 912a1b8c16aa..5598567de1f3 100644
--- a/compute/resource-manager/v2017_12_01/pom.xml
+++ b/compute/resource-manager/v2017_12_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.compute.v2017_12_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-compute</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Compute Management</name>
-    <description>This package contains Microsoft Compute Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.compute.v2017_12_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-compute</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Compute Management</name>
+    <description>This package contains Microsoft Compute Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AdditionalUnattendContent.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AdditionalUnattendContent.java
index 749f7491712c..bdd5f10b3a40 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AdditionalUnattendContent.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AdditionalUnattendContent.java
@@ -49,7 +49,7 @@ public class AdditionalUnattendContent {
     private String content;
 
     /**
-     * Get the passName value.
+     * Get the pass name. Currently, the only allowable value is OobeSystem. Possible values include: 'OobeSystem'.
      *
      * @return the passName value
      */
@@ -58,7 +58,7 @@ public PassNames passName() {
     }
 
     /**
-     * Set the passName value.
+     * Set the pass name. Currently, the only allowable value is OobeSystem. Possible values include: 'OobeSystem'.
      *
      * @param passName the passName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -69,7 +69,7 @@ public AdditionalUnattendContent withPassName(PassNames passName) {
     }
 
     /**
-     * Get the componentName value.
+     * Get the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup. Possible values include: 'Microsoft-Windows-Shell-Setup'.
      *
      * @return the componentName value
      */
@@ -78,7 +78,7 @@ public ComponentNames componentName() {
     }
 
     /**
-     * Set the componentName value.
+     * Set the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup. Possible values include: 'Microsoft-Windows-Shell-Setup'.
      *
      * @param componentName the componentName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -89,7 +89,7 @@ public AdditionalUnattendContent withComponentName(ComponentNames componentName)
     }
 
     /**
-     * Get the settingName value.
+     * Get specifies the name of the setting to which the content applies. Possible values are: FirstLogonCommands and AutoLogon. Possible values include: 'AutoLogon', 'FirstLogonCommands'.
      *
      * @return the settingName value
      */
@@ -98,7 +98,7 @@ public SettingNames settingName() {
     }
 
     /**
-     * Set the settingName value.
+     * Set specifies the name of the setting to which the content applies. Possible values are: FirstLogonCommands and AutoLogon. Possible values include: 'AutoLogon', 'FirstLogonCommands'.
      *
      * @param settingName the settingName value to set
      * @return the AdditionalUnattendContent object itself.
@@ -109,7 +109,7 @@ public AdditionalUnattendContent withSettingName(SettingNames settingName) {
     }
 
     /**
-     * Get the content value.
+     * Get specifies the XML formatted content that is added to the unattend.xml file for the specified path and component. The XML must be less than 4KB and must include the root element for the setting or feature that is being inserted.
      *
      * @return the content value
      */
@@ -118,7 +118,7 @@ public String content() {
     }
 
     /**
-     * Set the content value.
+     * Set specifies the XML formatted content that is added to the unattend.xml file for the specified path and component. The XML must be less than 4KB and must include the root element for the setting or feature that is being inserted.
      *
      * @param content the content value to set
      * @return the AdditionalUnattendContent object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiEntityReference.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiEntityReference.java
index 19bc4c49cf91..7c8662dff75e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiEntityReference.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiEntityReference.java
@@ -22,7 +22,7 @@ public class ApiEntityReference {
     private String id;
 
     /**
-     * Get the id value.
+     * Get the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
      *
      * @return the id value
      */
@@ -31,7 +31,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
      *
      * @param id the id value to set
      * @return the ApiEntityReference object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiError.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiError.java
index e904db231ec6..44d455c8b007 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiError.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiError.java
@@ -46,7 +46,7 @@ public class ApiError {
     private String message;
 
     /**
-     * Get the details value.
+     * Get the Api error details.
      *
      * @return the details value
      */
@@ -55,7 +55,7 @@ public List<ApiErrorBase> details() {
     }
 
     /**
-     * Set the details value.
+     * Set the Api error details.
      *
      * @param details the details value to set
      * @return the ApiError object itself.
@@ -66,7 +66,7 @@ public ApiError withDetails(List<ApiErrorBase> details) {
     }
 
     /**
-     * Get the innererror value.
+     * Get the Api inner error.
      *
      * @return the innererror value
      */
@@ -75,7 +75,7 @@ public InnerError innererror() {
     }
 
     /**
-     * Set the innererror value.
+     * Set the Api inner error.
      *
      * @param innererror the innererror value to set
      * @return the ApiError object itself.
@@ -86,7 +86,7 @@ public ApiError withInnererror(InnerError innererror) {
     }
 
     /**
-     * Get the code value.
+     * Get the error code.
      *
      * @return the code value
      */
@@ -95,7 +95,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the error code.
      *
      * @param code the code value to set
      * @return the ApiError object itself.
@@ -106,7 +106,7 @@ public ApiError withCode(String code) {
     }
 
     /**
-     * Get the target value.
+     * Get the target of the particular error.
      *
      * @return the target value
      */
@@ -115,7 +115,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target of the particular error.
      *
      * @param target the target value to set
      * @return the ApiError object itself.
@@ -126,7 +126,7 @@ public ApiError withTarget(String target) {
     }
 
     /**
-     * Get the message value.
+     * Get the error message.
      *
      * @return the message value
      */
@@ -135,7 +135,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the error message.
      *
      * @param message the message value to set
      * @return the ApiError object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiErrorBase.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiErrorBase.java
index 006a9da8cd1b..dc54be551336 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiErrorBase.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ApiErrorBase.java
@@ -33,7 +33,7 @@ public class ApiErrorBase {
     private String message;
 
     /**
-     * Get the code value.
+     * Get the error code.
      *
      * @return the code value
      */
@@ -42,7 +42,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the error code.
      *
      * @param code the code value to set
      * @return the ApiErrorBase object itself.
@@ -53,7 +53,7 @@ public ApiErrorBase withCode(String code) {
     }
 
     /**
-     * Get the target value.
+     * Get the target of the particular error.
      *
      * @return the target value
      */
@@ -62,7 +62,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target of the particular error.
      *
      * @param target the target value to set
      * @return the ApiErrorBase object itself.
@@ -73,7 +73,7 @@ public ApiErrorBase withTarget(String target) {
     }
 
     /**
-     * Get the message value.
+     * Get the error message.
      *
      * @return the message value
      */
@@ -82,7 +82,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the error message.
      *
      * @param message the message value to set
      * @return the ApiErrorBase object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AutoOSUpgradePolicy.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AutoOSUpgradePolicy.java
index 43aebfafe79c..548ce0d970d4 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AutoOSUpgradePolicy.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AutoOSUpgradePolicy.java
@@ -22,7 +22,7 @@ public class AutoOSUpgradePolicy {
     private Boolean disableAutoRollback;
 
     /**
-     * Get the disableAutoRollback value.
+     * Get whether OS image rollback feature should be disabled. Default value is false.
      *
      * @return the disableAutoRollback value
      */
@@ -31,7 +31,7 @@ public Boolean disableAutoRollback() {
     }
 
     /**
-     * Set the disableAutoRollback value.
+     * Set whether OS image rollback feature should be disabled. Default value is false.
      *
      * @param disableAutoRollback the disableAutoRollback value to set
      * @return the AutoOSUpgradePolicy object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySet.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySet.java
index a00ca6b22d26..7af6a91bcb23 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySet.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySet.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySetUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySetUpdate.java
index 0628498364ef..246ef30bf0b5 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySetUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySetUpdate.java
@@ -50,7 +50,7 @@ public class AvailabilitySetUpdate extends UpdateResource {
     private Sku sku;
 
     /**
-     * Get the platformUpdateDomainCount value.
+     * Get update Domain count.
      *
      * @return the platformUpdateDomainCount value
      */
@@ -59,7 +59,7 @@ public Integer platformUpdateDomainCount() {
     }
 
     /**
-     * Set the platformUpdateDomainCount value.
+     * Set update Domain count.
      *
      * @param platformUpdateDomainCount the platformUpdateDomainCount value to set
      * @return the AvailabilitySetUpdate object itself.
@@ -70,7 +70,7 @@ public AvailabilitySetUpdate withPlatformUpdateDomainCount(Integer platformUpdat
     }
 
     /**
-     * Get the platformFaultDomainCount value.
+     * Get fault Domain count.
      *
      * @return the platformFaultDomainCount value
      */
@@ -79,7 +79,7 @@ public Integer platformFaultDomainCount() {
     }
 
     /**
-     * Set the platformFaultDomainCount value.
+     * Set fault Domain count.
      *
      * @param platformFaultDomainCount the platformFaultDomainCount value to set
      * @return the AvailabilitySetUpdate object itself.
@@ -90,7 +90,7 @@ public AvailabilitySetUpdate withPlatformFaultDomainCount(Integer platformFaultD
     }
 
     /**
-     * Get the virtualMachines value.
+     * Get a list of references to all virtual machines in the availability set.
      *
      * @return the virtualMachines value
      */
@@ -99,7 +99,7 @@ public List<SubResource> virtualMachines() {
     }
 
     /**
-     * Set the virtualMachines value.
+     * Set a list of references to all virtual machines in the availability set.
      *
      * @param virtualMachines the virtualMachines value to set
      * @return the AvailabilitySetUpdate object itself.
@@ -110,7 +110,7 @@ public AvailabilitySetUpdate withVirtualMachines(List<SubResource> virtualMachin
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -119,7 +119,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Get the sku value.
+     * Get sku of the availability set.
      *
      * @return the sku value
      */
@@ -128,7 +128,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set sku of the availability set.
      *
      * @param sku the sku value to set
      * @return the AvailabilitySetUpdate object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySets.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySets.java
index fc354bbb5fb5..3b77fc24a909 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySets.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/AvailabilitySets.java
@@ -14,6 +14,7 @@
 import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
 import rx.Observable;
 import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.AvailabilitySetsInner;
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySetVirtualMachineSize;
@@ -21,7 +22,7 @@
 /**
  * Type representing AvailabilitySets.
  */
-public interface AvailabilitySets extends SupportsCreating<AvailabilitySet.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<AvailabilitySet>, SupportsListingByResourceGroup<AvailabilitySet>, HasInner<AvailabilitySetsInner> {
+public interface AvailabilitySets extends SupportsCreating<AvailabilitySet.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<AvailabilitySet>, SupportsListingByResourceGroup<AvailabilitySet>, SupportsListing<AvailabilitySet>, HasInner<AvailabilitySetsInner> {
     /**
      * Lists all available virtual machine sizes that can be used to create a new virtual machine in an existing availability set.
      *
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnostics.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnostics.java
index d59fd7c2fa03..abde4fb15a84 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnostics.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnostics.java
@@ -32,7 +32,7 @@ public class BootDiagnostics {
     private String storageUri;
 
     /**
-     * Get the enabled value.
+     * Get whether boot diagnostics should be enabled on the Virtual Machine.
      *
      * @return the enabled value
      */
@@ -41,7 +41,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set whether boot diagnostics should be enabled on the Virtual Machine.
      *
      * @param enabled the enabled value to set
      * @return the BootDiagnostics object itself.
@@ -52,7 +52,7 @@ public BootDiagnostics withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get the storageUri value.
+     * Get uri of the storage account to use for placing the console output and screenshot.
      *
      * @return the storageUri value
      */
@@ -61,7 +61,7 @@ public String storageUri() {
     }
 
     /**
-     * Set the storageUri value.
+     * Set uri of the storage account to use for placing the console output and screenshot.
      *
      * @param storageUri the storageUri value to set
      * @return the BootDiagnostics object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnosticsInstanceView.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnosticsInstanceView.java
index f374f8673820..038592758e98 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnosticsInstanceView.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/BootDiagnosticsInstanceView.java
@@ -27,7 +27,7 @@ public class BootDiagnosticsInstanceView {
     private String serialConsoleLogBlobUri;
 
     /**
-     * Get the consoleScreenshotBlobUri value.
+     * Get the console screenshot blob URI.
      *
      * @return the consoleScreenshotBlobUri value
      */
@@ -36,7 +36,7 @@ public String consoleScreenshotBlobUri() {
     }
 
     /**
-     * Set the consoleScreenshotBlobUri value.
+     * Set the console screenshot blob URI.
      *
      * @param consoleScreenshotBlobUri the consoleScreenshotBlobUri value to set
      * @return the BootDiagnosticsInstanceView object itself.
@@ -47,7 +47,7 @@ public BootDiagnosticsInstanceView withConsoleScreenshotBlobUri(String consoleSc
     }
 
     /**
-     * Get the serialConsoleLogBlobUri value.
+     * Get the Linux serial console log blob Uri.
      *
      * @return the serialConsoleLogBlobUri value
      */
@@ -56,7 +56,7 @@ public String serialConsoleLogBlobUri() {
     }
 
     /**
-     * Set the serialConsoleLogBlobUri value.
+     * Set the Linux serial console log blob Uri.
      *
      * @param serialConsoleLogBlobUri the serialConsoleLogBlobUri value to set
      * @return the BootDiagnosticsInstanceView object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ComputeLongRunningOperationProperties.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ComputeLongRunningOperationProperties.java
index b3871c2f9069..d14498f6bc55 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ComputeLongRunningOperationProperties.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ComputeLongRunningOperationProperties.java
@@ -21,7 +21,7 @@ public class ComputeLongRunningOperationProperties {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -30,7 +30,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the ComputeLongRunningOperationProperties object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDisk.java
index 3e61f8aa104a..c77a7d280bb1 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDisk.java
@@ -75,7 +75,7 @@ public class DataDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -88,7 +88,7 @@ public class DataDisk {
     private ManagedDiskParameters managedDisk;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -97,7 +97,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the DataDisk object itself.
@@ -108,7 +108,7 @@ public DataDisk withLun(int lun) {
     }
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -117,7 +117,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the DataDisk object itself.
@@ -128,7 +128,7 @@ public DataDisk withName(String name) {
     }
 
     /**
-     * Get the vhd value.
+     * Get the virtual hard disk.
      *
      * @return the vhd value
      */
@@ -137,7 +137,7 @@ public VirtualHardDisk vhd() {
     }
 
     /**
-     * Set the vhd value.
+     * Set the virtual hard disk.
      *
      * @param vhd the vhd value to set
      * @return the DataDisk object itself.
@@ -148,7 +148,7 @@ public DataDisk withVhd(VirtualHardDisk vhd) {
     }
 
     /**
-     * Get the image value.
+     * Get the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @return the image value
      */
@@ -157,7 +157,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @param image the image value to set
      * @return the DataDisk object itself.
@@ -168,7 +168,7 @@ public DataDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -177,7 +177,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the DataDisk object itself.
@@ -188,7 +188,7 @@ public DataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the writeAcceleratorEnabled value.
+     * Get specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @return the writeAcceleratorEnabled value
      */
@@ -197,7 +197,7 @@ public Boolean writeAcceleratorEnabled() {
     }
 
     /**
-     * Set the writeAcceleratorEnabled value.
+     * Set specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @param writeAcceleratorEnabled the writeAcceleratorEnabled value to set
      * @return the DataDisk object itself.
@@ -208,7 +208,7 @@ public DataDisk withWriteAcceleratorEnabled(Boolean writeAcceleratorEnabled) {
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -217,7 +217,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the DataDisk object itself.
@@ -228,7 +228,7 @@ public DataDisk withCreateOption(DiskCreateOptionTypes createOption) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -237,7 +237,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DataDisk object itself.
@@ -248,7 +248,7 @@ public DataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -257,7 +257,7 @@ public ManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the DataDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDiskImage.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDiskImage.java
index a4641b82cb16..9bc924c3cd7a 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDiskImage.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DataDiskImage.java
@@ -23,7 +23,7 @@ public class DataDiskImage {
     private Integer lun;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiagnosticsProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiagnosticsProfile.java
index 485d4e5892b6..9bdc138e1abc 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiagnosticsProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiagnosticsProfile.java
@@ -27,7 +27,7 @@ public class DiagnosticsProfile {
     private BootDiagnostics bootDiagnostics;
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -36,7 +36,7 @@ public BootDiagnostics bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the DiagnosticsProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskEncryptionSettings.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskEncryptionSettings.java
index 6d8f1da0a575..9112faee31c9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskEncryptionSettings.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskEncryptionSettings.java
@@ -35,7 +35,7 @@ public class DiskEncryptionSettings {
     private Boolean enabled;
 
     /**
-     * Get the diskEncryptionKey value.
+     * Get specifies the location of the disk encryption key, which is a Key Vault Secret.
      *
      * @return the diskEncryptionKey value
      */
@@ -44,7 +44,7 @@ public KeyVaultSecretReference diskEncryptionKey() {
     }
 
     /**
-     * Set the diskEncryptionKey value.
+     * Set specifies the location of the disk encryption key, which is a Key Vault Secret.
      *
      * @param diskEncryptionKey the diskEncryptionKey value to set
      * @return the DiskEncryptionSettings object itself.
@@ -55,7 +55,7 @@ public DiskEncryptionSettings withDiskEncryptionKey(KeyVaultSecretReference disk
     }
 
     /**
-     * Get the keyEncryptionKey value.
+     * Get specifies the location of the key encryption key in Key Vault.
      *
      * @return the keyEncryptionKey value
      */
@@ -64,7 +64,7 @@ public KeyVaultKeyReference keyEncryptionKey() {
     }
 
     /**
-     * Set the keyEncryptionKey value.
+     * Set specifies the location of the key encryption key in Key Vault.
      *
      * @param keyEncryptionKey the keyEncryptionKey value to set
      * @return the DiskEncryptionSettings object itself.
@@ -75,7 +75,7 @@ public DiskEncryptionSettings withKeyEncryptionKey(KeyVaultKeyReference keyEncry
     }
 
     /**
-     * Get the enabled value.
+     * Get specifies whether disk encryption should be enabled on the virtual machine.
      *
      * @return the enabled value
      */
@@ -84,7 +84,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set specifies whether disk encryption should be enabled on the virtual machine.
      *
      * @param enabled the enabled value to set
      * @return the DiskEncryptionSettings object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskInstanceView.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskInstanceView.java
index edcd01330973..3f91db1d3b71 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskInstanceView.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/DiskInstanceView.java
@@ -35,7 +35,7 @@ public class DiskInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -44,7 +44,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the DiskInstanceView object itself.
@@ -55,7 +55,7 @@ public DiskInstanceView withName(String name) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the encryptionSettings value
      */
@@ -64,7 +64,7 @@ public List<DiskEncryptionSettings> encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskInstanceView object itself.
@@ -75,7 +75,7 @@ public DiskInstanceView withEncryptionSettings(List<DiskEncryptionSettings> encr
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -84,7 +84,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the DiskInstanceView object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/HardwareProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/HardwareProfile.java
index 0de0d9e4a29b..13dd315fb367 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/HardwareProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/HardwareProfile.java
@@ -79,7 +79,7 @@ public class HardwareProfile {
     private VirtualMachineSizeTypes vmSize;
 
     /**
-     * Get the vmSize value.
+     * Get specifies the size of the virtual machine. For more information about virtual machine sizes, see [Sizes for virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; The available VM sizes depend on region and availability set. For a list of available sizes use these APIs:  &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in an availability set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in a region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes for resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes). Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2', 'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms', 'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3', 'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3', 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2', 'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2', 'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3', 'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3', 'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3', 'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8', 'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s', 'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m', 'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms', 'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms', 'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms', 'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2', 'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3', 'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s', 'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'.
      *
      * @return the vmSize value
      */
@@ -88,7 +88,7 @@ public VirtualMachineSizeTypes vmSize() {
     }
 
     /**
-     * Set the vmSize value.
+     * Set specifies the size of the virtual machine. For more information about virtual machine sizes, see [Sizes for virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; The available VM sizes depend on region and availability set. For a list of available sizes use these APIs:  &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in an availability set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes in a region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list) &lt;br&gt;&lt;br&gt; [List all available virtual machine sizes for resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes). Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2', 'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms', 'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3', 'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3', 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2', 'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2', 'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3', 'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3', 'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3', 'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8', 'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s', 'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2', 'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m', 'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms', 'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms', 'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms', 'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2', 'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3', 'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s', 'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'.
      *
      * @param vmSize the vmSize value to set
      * @return the HardwareProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Image.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Image.java
index ebfaa9082c5f..1fa9d68824d5 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Image.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Image.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
 import com.microsoft.azure.SubResource;
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageDataDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageDataDisk.java
index 2c479d174eeb..b8b8fff74e98 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageDataDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageDataDisk.java
@@ -68,7 +68,7 @@ public class ImageDataDisk {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -77,7 +77,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the ImageDataDisk object itself.
@@ -88,7 +88,7 @@ public ImageDataDisk withLun(int lun) {
     }
 
     /**
-     * Get the snapshot value.
+     * Get the snapshot.
      *
      * @return the snapshot value
      */
@@ -97,7 +97,7 @@ public SubResource snapshot() {
     }
 
     /**
-     * Set the snapshot value.
+     * Set the snapshot.
      *
      * @param snapshot the snapshot value to set
      * @return the ImageDataDisk object itself.
@@ -108,7 +108,7 @@ public ImageDataDisk withSnapshot(SubResource snapshot) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managedDisk.
      *
      * @return the managedDisk value
      */
@@ -117,7 +117,7 @@ public SubResource managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managedDisk.
      *
      * @param managedDisk the managedDisk value to set
      * @return the ImageDataDisk object itself.
@@ -128,7 +128,7 @@ public ImageDataDisk withManagedDisk(SubResource managedDisk) {
     }
 
     /**
-     * Get the blobUri value.
+     * Get the Virtual Hard Disk.
      *
      * @return the blobUri value
      */
@@ -137,7 +137,7 @@ public String blobUri() {
     }
 
     /**
-     * Set the blobUri value.
+     * Set the Virtual Hard Disk.
      *
      * @param blobUri the blobUri value to set
      * @return the ImageDataDisk object itself.
@@ -148,7 +148,7 @@ public ImageDataDisk withBlobUri(String blobUri) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -157,7 +157,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the ImageDataDisk object itself.
@@ -168,7 +168,7 @@ public ImageDataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -177,7 +177,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the ImageDataDisk object itself.
@@ -188,7 +188,7 @@ public ImageDataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -197,7 +197,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ImageDataDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageOSDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageOSDisk.java
index 4403e1300004..f56294fef177 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageOSDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageOSDisk.java
@@ -76,7 +76,7 @@ public class ImageOSDisk {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from a custom image. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -85,7 +85,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from a custom image. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the ImageOSDisk object itself.
@@ -96,7 +96,7 @@ public ImageOSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the osState value.
+     * Get the OS State. Possible values include: 'Generalized', 'Specialized'.
      *
      * @return the osState value
      */
@@ -105,7 +105,7 @@ public OperatingSystemStateTypes osState() {
     }
 
     /**
-     * Set the osState value.
+     * Set the OS State. Possible values include: 'Generalized', 'Specialized'.
      *
      * @param osState the osState value to set
      * @return the ImageOSDisk object itself.
@@ -116,7 +116,7 @@ public ImageOSDisk withOsState(OperatingSystemStateTypes osState) {
     }
 
     /**
-     * Get the snapshot value.
+     * Get the snapshot.
      *
      * @return the snapshot value
      */
@@ -125,7 +125,7 @@ public SubResource snapshot() {
     }
 
     /**
-     * Set the snapshot value.
+     * Set the snapshot.
      *
      * @param snapshot the snapshot value to set
      * @return the ImageOSDisk object itself.
@@ -136,7 +136,7 @@ public ImageOSDisk withSnapshot(SubResource snapshot) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managedDisk.
      *
      * @return the managedDisk value
      */
@@ -145,7 +145,7 @@ public SubResource managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managedDisk.
      *
      * @param managedDisk the managedDisk value to set
      * @return the ImageOSDisk object itself.
@@ -156,7 +156,7 @@ public ImageOSDisk withManagedDisk(SubResource managedDisk) {
     }
 
     /**
-     * Get the blobUri value.
+     * Get the Virtual Hard Disk.
      *
      * @return the blobUri value
      */
@@ -165,7 +165,7 @@ public String blobUri() {
     }
 
     /**
-     * Set the blobUri value.
+     * Set the Virtual Hard Disk.
      *
      * @param blobUri the blobUri value to set
      * @return the ImageOSDisk object itself.
@@ -176,7 +176,7 @@ public ImageOSDisk withBlobUri(String blobUri) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -185,7 +185,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the ImageOSDisk object itself.
@@ -196,7 +196,7 @@ public ImageOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -205,7 +205,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of empty data disks in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the ImageOSDisk object itself.
@@ -216,7 +216,7 @@ public ImageOSDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -225,7 +225,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ImageOSDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageReference.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageReference.java
index 2dc2dcc9cc55..7b4415e5cc72 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageReference.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageReference.java
@@ -50,7 +50,7 @@ public class ImageReference extends SubResource {
     private String version;
 
     /**
-     * Get the publisher value.
+     * Get the image publisher.
      *
      * @return the publisher value
      */
@@ -59,7 +59,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the image publisher.
      *
      * @param publisher the publisher value to set
      * @return the ImageReference object itself.
@@ -70,7 +70,7 @@ public ImageReference withPublisher(String publisher) {
     }
 
     /**
-     * Get the offer value.
+     * Get specifies the offer of the platform image or marketplace image used to create the virtual machine.
      *
      * @return the offer value
      */
@@ -79,7 +79,7 @@ public String offer() {
     }
 
     /**
-     * Set the offer value.
+     * Set specifies the offer of the platform image or marketplace image used to create the virtual machine.
      *
      * @param offer the offer value to set
      * @return the ImageReference object itself.
@@ -90,7 +90,7 @@ public ImageReference withOffer(String offer) {
     }
 
     /**
-     * Get the sku value.
+     * Get the image SKU.
      *
      * @return the sku value
      */
@@ -99,7 +99,7 @@ public String sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the image SKU.
      *
      * @param sku the sku value to set
      * @return the ImageReference object itself.
@@ -110,7 +110,7 @@ public ImageReference withSku(String sku) {
     }
 
     /**
-     * Get the version value.
+     * Get specifies the version of the platform image or marketplace image used to create the virtual machine. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.
      *
      * @return the version value
      */
@@ -119,7 +119,7 @@ public String version() {
     }
 
     /**
-     * Set the version value.
+     * Set specifies the version of the platform image or marketplace image used to create the virtual machine. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal numbers. Specify 'latest' to use the latest version of an image available at deploy time. Even if you use 'latest', the VM image will not automatically update after deploy time even if a new version becomes available.
      *
      * @param version the version value to set
      * @return the ImageReference object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageStorageProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageStorageProfile.java
index 175d97c41ec5..d6d17915afdf 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageStorageProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageStorageProfile.java
@@ -42,7 +42,7 @@ public class ImageStorageProfile {
     private Boolean zoneResilient;
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -51,7 +51,7 @@ public ImageOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the ImageStorageProfile object itself.
@@ -62,7 +62,7 @@ public ImageStorageProfile withOsDisk(ImageOSDisk osDisk) {
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -71,7 +71,7 @@ public List<ImageDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the ImageStorageProfile object itself.
@@ -82,7 +82,7 @@ public ImageStorageProfile withDataDisks(List<ImageDataDisk> dataDisks) {
     }
 
     /**
-     * Get the zoneResilient value.
+     * Get specifies whether an image is zone resilient or not. Default is false. Zone resilient images can be created only in regions that provide Zone Redundant Storage (ZRS).
      *
      * @return the zoneResilient value
      */
@@ -91,7 +91,7 @@ public Boolean zoneResilient() {
     }
 
     /**
-     * Set the zoneResilient value.
+     * Set specifies whether an image is zone resilient or not. Default is false. Zone resilient images can be created only in regions that provide Zone Redundant Storage (ZRS).
      *
      * @param zoneResilient the zoneResilient value to set
      * @return the ImageStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageUpdate.java
index f365e080bb14..a618273c6fbd 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ImageUpdate.java
@@ -36,7 +36,7 @@ public class ImageUpdate extends UpdateResource {
     private String provisioningState;
 
     /**
-     * Get the sourceVirtualMachine value.
+     * Get the source virtual machine from which Image is created.
      *
      * @return the sourceVirtualMachine value
      */
@@ -45,7 +45,7 @@ public SubResource sourceVirtualMachine() {
     }
 
     /**
-     * Set the sourceVirtualMachine value.
+     * Set the source virtual machine from which Image is created.
      *
      * @param sourceVirtualMachine the sourceVirtualMachine value to set
      * @return the ImageUpdate object itself.
@@ -56,7 +56,7 @@ public ImageUpdate withSourceVirtualMachine(SubResource sourceVirtualMachine) {
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -65,7 +65,7 @@ public ImageStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the ImageUpdate object itself.
@@ -76,7 +76,7 @@ public ImageUpdate withStorageProfile(ImageStorageProfile storageProfile) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InnerError.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InnerError.java
index f6eb66554eed..05fc927e8af5 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InnerError.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InnerError.java
@@ -27,7 +27,7 @@ public class InnerError {
     private String errordetail;
 
     /**
-     * Get the exceptiontype value.
+     * Get the exception type.
      *
      * @return the exceptiontype value
      */
@@ -36,7 +36,7 @@ public String exceptiontype() {
     }
 
     /**
-     * Set the exceptiontype value.
+     * Set the exception type.
      *
      * @param exceptiontype the exceptiontype value to set
      * @return the InnerError object itself.
@@ -47,7 +47,7 @@ public InnerError withExceptiontype(String exceptiontype) {
     }
 
     /**
-     * Get the errordetail value.
+     * Get the internal error message or exception dump.
      *
      * @return the errordetail value
      */
@@ -56,7 +56,7 @@ public String errordetail() {
     }
 
     /**
-     * Set the errordetail value.
+     * Set the internal error message or exception dump.
      *
      * @param errordetail the errordetail value to set
      * @return the InnerError object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InstanceViewStatus.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InstanceViewStatus.java
index 44231fbbfb28..b9c74cb5d474 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InstanceViewStatus.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/InstanceViewStatus.java
@@ -46,7 +46,7 @@ public class InstanceViewStatus {
     private DateTime time;
 
     /**
-     * Get the code value.
+     * Get the status code.
      *
      * @return the code value
      */
@@ -55,7 +55,7 @@ public String code() {
     }
 
     /**
-     * Set the code value.
+     * Set the status code.
      *
      * @param code the code value to set
      * @return the InstanceViewStatus object itself.
@@ -66,7 +66,7 @@ public InstanceViewStatus withCode(String code) {
     }
 
     /**
-     * Get the level value.
+     * Get the level code. Possible values include: 'Info', 'Warning', 'Error'.
      *
      * @return the level value
      */
@@ -75,7 +75,7 @@ public StatusLevelTypes level() {
     }
 
     /**
-     * Set the level value.
+     * Set the level code. Possible values include: 'Info', 'Warning', 'Error'.
      *
      * @param level the level value to set
      * @return the InstanceViewStatus object itself.
@@ -86,7 +86,7 @@ public InstanceViewStatus withLevel(StatusLevelTypes level) {
     }
 
     /**
-     * Get the displayStatus value.
+     * Get the short localizable label for the status.
      *
      * @return the displayStatus value
      */
@@ -95,7 +95,7 @@ public String displayStatus() {
     }
 
     /**
-     * Set the displayStatus value.
+     * Set the short localizable label for the status.
      *
      * @param displayStatus the displayStatus value to set
      * @return the InstanceViewStatus object itself.
@@ -106,7 +106,7 @@ public InstanceViewStatus withDisplayStatus(String displayStatus) {
     }
 
     /**
-     * Get the message value.
+     * Get the detailed status message, including for alerts and error messages.
      *
      * @return the message value
      */
@@ -115,7 +115,7 @@ public String message() {
     }
 
     /**
-     * Set the message value.
+     * Set the detailed status message, including for alerts and error messages.
      *
      * @param message the message value to set
      * @return the InstanceViewStatus object itself.
@@ -126,7 +126,7 @@ public InstanceViewStatus withMessage(String message) {
     }
 
     /**
-     * Get the time value.
+     * Get the time of the status.
      *
      * @return the time value
      */
@@ -135,7 +135,7 @@ public DateTime time() {
     }
 
     /**
-     * Set the time value.
+     * Set the time of the status.
      *
      * @param time the time value to set
      * @return the InstanceViewStatus object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultKeyReference.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultKeyReference.java
index 660eedd02e02..5a4b54244b16 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultKeyReference.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultKeyReference.java
@@ -28,7 +28,7 @@ public class KeyVaultKeyReference {
     private SubResource sourceVault;
 
     /**
-     * Get the keyUrl value.
+     * Get the URL referencing a key encryption key in Key Vault.
      *
      * @return the keyUrl value
      */
@@ -37,7 +37,7 @@ public String keyUrl() {
     }
 
     /**
-     * Set the keyUrl value.
+     * Set the URL referencing a key encryption key in Key Vault.
      *
      * @param keyUrl the keyUrl value to set
      * @return the KeyVaultKeyReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultKeyReference withKeyUrl(String keyUrl) {
     }
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing the key.
      *
      * @return the sourceVault value
      */
@@ -57,7 +57,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing the key.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultKeyReference object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultSecretReference.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultSecretReference.java
index c64fffff70d3..d950e13de31e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultSecretReference.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/KeyVaultSecretReference.java
@@ -28,7 +28,7 @@ public class KeyVaultSecretReference {
     private SubResource sourceVault;
 
     /**
-     * Get the secretUrl value.
+     * Get the URL referencing a secret in a Key Vault.
      *
      * @return the secretUrl value
      */
@@ -37,7 +37,7 @@ public String secretUrl() {
     }
 
     /**
-     * Set the secretUrl value.
+     * Set the URL referencing a secret in a Key Vault.
      *
      * @param secretUrl the secretUrl value to set
      * @return the KeyVaultSecretReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultSecretReference withSecretUrl(String secretUrl) {
     }
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing the secret.
      *
      * @return the sourceVault value
      */
@@ -57,7 +57,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing the secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultSecretReference object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LinuxConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LinuxConfiguration.java
index dd065115e926..1583ee4dc3dd 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LinuxConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LinuxConfiguration.java
@@ -33,7 +33,7 @@ public class LinuxConfiguration {
     private SshConfiguration ssh;
 
     /**
-     * Get the disablePasswordAuthentication value.
+     * Get specifies whether password authentication should be disabled.
      *
      * @return the disablePasswordAuthentication value
      */
@@ -42,7 +42,7 @@ public Boolean disablePasswordAuthentication() {
     }
 
     /**
-     * Set the disablePasswordAuthentication value.
+     * Set specifies whether password authentication should be disabled.
      *
      * @param disablePasswordAuthentication the disablePasswordAuthentication value to set
      * @return the LinuxConfiguration object itself.
@@ -53,7 +53,7 @@ public LinuxConfiguration withDisablePasswordAuthentication(Boolean disablePassw
     }
 
     /**
-     * Get the ssh value.
+     * Get specifies the ssh key configuration for a Linux OS.
      *
      * @return the ssh value
      */
@@ -62,7 +62,7 @@ public SshConfiguration ssh() {
     }
 
     /**
-     * Set the ssh value.
+     * Set specifies the ssh key configuration for a Linux OS.
      *
      * @param ssh the ssh value to set
      * @return the LinuxConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsInputBase.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsInputBase.java
index 32315ac3bf96..67c7e05d4059 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsInputBase.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsInputBase.java
@@ -53,7 +53,7 @@ public class LogAnalyticsInputBase {
     private Boolean groupByResourceName;
 
     /**
-     * Get the blobContainerSasUri value.
+     * Get sAS Uri of the logging blob container to which LogAnalytics Api writes output logs to.
      *
      * @return the blobContainerSasUri value
      */
@@ -62,7 +62,7 @@ public String blobContainerSasUri() {
     }
 
     /**
-     * Set the blobContainerSasUri value.
+     * Set sAS Uri of the logging blob container to which LogAnalytics Api writes output logs to.
      *
      * @param blobContainerSasUri the blobContainerSasUri value to set
      * @return the LogAnalyticsInputBase object itself.
@@ -73,7 +73,7 @@ public LogAnalyticsInputBase withBlobContainerSasUri(String blobContainerSasUri)
     }
 
     /**
-     * Get the fromTime value.
+     * Get from time of the query.
      *
      * @return the fromTime value
      */
@@ -82,7 +82,7 @@ public DateTime fromTime() {
     }
 
     /**
-     * Set the fromTime value.
+     * Set from time of the query.
      *
      * @param fromTime the fromTime value to set
      * @return the LogAnalyticsInputBase object itself.
@@ -93,7 +93,7 @@ public LogAnalyticsInputBase withFromTime(DateTime fromTime) {
     }
 
     /**
-     * Get the toTime value.
+     * Get to time of the query.
      *
      * @return the toTime value
      */
@@ -102,7 +102,7 @@ public DateTime toTime() {
     }
 
     /**
-     * Set the toTime value.
+     * Set to time of the query.
      *
      * @param toTime the toTime value to set
      * @return the LogAnalyticsInputBase object itself.
@@ -113,7 +113,7 @@ public LogAnalyticsInputBase withToTime(DateTime toTime) {
     }
 
     /**
-     * Get the groupByThrottlePolicy value.
+     * Get group query result by Throttle Policy applied.
      *
      * @return the groupByThrottlePolicy value
      */
@@ -122,7 +122,7 @@ public Boolean groupByThrottlePolicy() {
     }
 
     /**
-     * Set the groupByThrottlePolicy value.
+     * Set group query result by Throttle Policy applied.
      *
      * @param groupByThrottlePolicy the groupByThrottlePolicy value to set
      * @return the LogAnalyticsInputBase object itself.
@@ -133,7 +133,7 @@ public LogAnalyticsInputBase withGroupByThrottlePolicy(Boolean groupByThrottlePo
     }
 
     /**
-     * Get the groupByOperationName value.
+     * Get group query result by  by Operation Name.
      *
      * @return the groupByOperationName value
      */
@@ -142,7 +142,7 @@ public Boolean groupByOperationName() {
     }
 
     /**
-     * Set the groupByOperationName value.
+     * Set group query result by  by Operation Name.
      *
      * @param groupByOperationName the groupByOperationName value to set
      * @return the LogAnalyticsInputBase object itself.
@@ -153,7 +153,7 @@ public LogAnalyticsInputBase withGroupByOperationName(Boolean groupByOperationNa
     }
 
     /**
-     * Get the groupByResourceName value.
+     * Get group query result by Resource Name.
      *
      * @return the groupByResourceName value
      */
@@ -162,7 +162,7 @@ public Boolean groupByResourceName() {
     }
 
     /**
-     * Set the groupByResourceName value.
+     * Set group query result by Resource Name.
      *
      * @param groupByResourceName the groupByResourceName value to set
      * @return the LogAnalyticsInputBase object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsOutput.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsOutput.java
index ffadc4edb9bc..be24b5f7aae9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsOutput.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/LogAnalyticsOutput.java
@@ -21,7 +21,7 @@ public class LogAnalyticsOutput {
     private String output;
 
     /**
-     * Get the output value.
+     * Get output file Uri path to blob container.
      *
      * @return the output value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/MaintenanceRedeployStatus.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/MaintenanceRedeployStatus.java
index b0f8b898bff7..96357e6bcf37 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/MaintenanceRedeployStatus.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/MaintenanceRedeployStatus.java
@@ -59,7 +59,7 @@ public class MaintenanceRedeployStatus {
     private String lastOperationMessage;
 
     /**
-     * Get the isCustomerInitiatedMaintenanceAllowed value.
+     * Get true, if customer is allowed to perform Maintenance.
      *
      * @return the isCustomerInitiatedMaintenanceAllowed value
      */
@@ -68,7 +68,7 @@ public Boolean isCustomerInitiatedMaintenanceAllowed() {
     }
 
     /**
-     * Set the isCustomerInitiatedMaintenanceAllowed value.
+     * Set true, if customer is allowed to perform Maintenance.
      *
      * @param isCustomerInitiatedMaintenanceAllowed the isCustomerInitiatedMaintenanceAllowed value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -79,7 +79,7 @@ public MaintenanceRedeployStatus withIsCustomerInitiatedMaintenanceAllowed(Boole
     }
 
     /**
-     * Get the preMaintenanceWindowStartTime value.
+     * Get start Time for the Pre Maintenance Window.
      *
      * @return the preMaintenanceWindowStartTime value
      */
@@ -88,7 +88,7 @@ public DateTime preMaintenanceWindowStartTime() {
     }
 
     /**
-     * Set the preMaintenanceWindowStartTime value.
+     * Set start Time for the Pre Maintenance Window.
      *
      * @param preMaintenanceWindowStartTime the preMaintenanceWindowStartTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -99,7 +99,7 @@ public MaintenanceRedeployStatus withPreMaintenanceWindowStartTime(DateTime preM
     }
 
     /**
-     * Get the preMaintenanceWindowEndTime value.
+     * Get end Time for the Pre Maintenance Window.
      *
      * @return the preMaintenanceWindowEndTime value
      */
@@ -108,7 +108,7 @@ public DateTime preMaintenanceWindowEndTime() {
     }
 
     /**
-     * Set the preMaintenanceWindowEndTime value.
+     * Set end Time for the Pre Maintenance Window.
      *
      * @param preMaintenanceWindowEndTime the preMaintenanceWindowEndTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -119,7 +119,7 @@ public MaintenanceRedeployStatus withPreMaintenanceWindowEndTime(DateTime preMai
     }
 
     /**
-     * Get the maintenanceWindowStartTime value.
+     * Get start Time for the Maintenance Window.
      *
      * @return the maintenanceWindowStartTime value
      */
@@ -128,7 +128,7 @@ public DateTime maintenanceWindowStartTime() {
     }
 
     /**
-     * Set the maintenanceWindowStartTime value.
+     * Set start Time for the Maintenance Window.
      *
      * @param maintenanceWindowStartTime the maintenanceWindowStartTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -139,7 +139,7 @@ public MaintenanceRedeployStatus withMaintenanceWindowStartTime(DateTime mainten
     }
 
     /**
-     * Get the maintenanceWindowEndTime value.
+     * Get end Time for the Maintenance Window.
      *
      * @return the maintenanceWindowEndTime value
      */
@@ -148,7 +148,7 @@ public DateTime maintenanceWindowEndTime() {
     }
 
     /**
-     * Set the maintenanceWindowEndTime value.
+     * Set end Time for the Maintenance Window.
      *
      * @param maintenanceWindowEndTime the maintenanceWindowEndTime value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -159,7 +159,7 @@ public MaintenanceRedeployStatus withMaintenanceWindowEndTime(DateTime maintenan
     }
 
     /**
-     * Get the lastOperationResultCode value.
+     * Get the Last Maintenance Operation Result Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted', 'MaintenanceCompleted'.
      *
      * @return the lastOperationResultCode value
      */
@@ -168,7 +168,7 @@ public MaintenanceOperationResultCodeTypes lastOperationResultCode() {
     }
 
     /**
-     * Set the lastOperationResultCode value.
+     * Set the Last Maintenance Operation Result Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted', 'MaintenanceCompleted'.
      *
      * @param lastOperationResultCode the lastOperationResultCode value to set
      * @return the MaintenanceRedeployStatus object itself.
@@ -179,7 +179,7 @@ public MaintenanceRedeployStatus withLastOperationResultCode(MaintenanceOperatio
     }
 
     /**
-     * Get the lastOperationMessage value.
+     * Get message returned for the last Maintenance Operation.
      *
      * @return the lastOperationMessage value
      */
@@ -188,7 +188,7 @@ public String lastOperationMessage() {
     }
 
     /**
-     * Set the lastOperationMessage value.
+     * Set message returned for the last Maintenance Operation.
      *
      * @param lastOperationMessage the lastOperationMessage value to set
      * @return the MaintenanceRedeployStatus object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ManagedDiskParameters.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ManagedDiskParameters.java
index f0a64bfd5b71..cc9c9e212073 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ManagedDiskParameters.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/ManagedDiskParameters.java
@@ -24,7 +24,7 @@ public class ManagedDiskParameters extends SubResource {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -33,7 +33,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the ManagedDiskParameters object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkInterfaceReference.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkInterfaceReference.java
index f2e1554a4664..04a43568b56c 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkInterfaceReference.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkInterfaceReference.java
@@ -25,7 +25,7 @@ public class NetworkInterfaceReference extends SubResource {
     private Boolean primary;
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -34,7 +34,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the NetworkInterfaceReference object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkProfile.java
index 4df59c458a67..a5b70bffd93f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/NetworkProfile.java
@@ -23,7 +23,7 @@ public class NetworkProfile {
     private List<NetworkInterfaceReference> networkInterfaces;
 
     /**
-     * Get the networkInterfaces value.
+     * Get specifies the list of resource Ids for the network interfaces associated with the virtual machine.
      *
      * @return the networkInterfaces value
      */
@@ -32,7 +32,7 @@ public List<NetworkInterfaceReference> networkInterfaces() {
     }
 
     /**
-     * Set the networkInterfaces value.
+     * Set specifies the list of resource Ids for the network interfaces associated with the virtual machine.
      *
      * @param networkInterfaces the networkInterfaces value to set
      * @return the NetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDisk.java
index 08aaf14028c6..b4e79eaccb22 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDisk.java
@@ -87,7 +87,7 @@ public class OSDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -100,7 +100,7 @@ public class OSDisk {
     private ManagedDiskParameters managedDisk;
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -109,7 +109,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the OSDisk object itself.
@@ -120,7 +120,7 @@ public OSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the encryptionSettings value
      */
@@ -129,7 +129,7 @@ public DiskEncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set specifies the encryption settings for the OS Disk. &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the OSDisk object itself.
@@ -140,7 +140,7 @@ public OSDisk withEncryptionSettings(DiskEncryptionSettings encryptionSettings)
     }
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -149,7 +149,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the OSDisk object itself.
@@ -160,7 +160,7 @@ public OSDisk withName(String name) {
     }
 
     /**
-     * Get the vhd value.
+     * Get the virtual hard disk.
      *
      * @return the vhd value
      */
@@ -169,7 +169,7 @@ public VirtualHardDisk vhd() {
     }
 
     /**
-     * Set the vhd value.
+     * Set the virtual hard disk.
      *
      * @param vhd the vhd value to set
      * @return the OSDisk object itself.
@@ -180,7 +180,7 @@ public OSDisk withVhd(VirtualHardDisk vhd) {
     }
 
     /**
-     * Get the image value.
+     * Get the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @return the image value
      */
@@ -189,7 +189,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the source user image virtual hard disk. The virtual hard disk will be copied before being attached to the virtual machine. If SourceImage is provided, the destination virtual hard drive must not exist.
      *
      * @param image the image value to set
      * @return the OSDisk object itself.
@@ -200,7 +200,7 @@ public OSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -209,7 +209,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the OSDisk object itself.
@@ -220,7 +220,7 @@ public OSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the writeAcceleratorEnabled value.
+     * Get specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @return the writeAcceleratorEnabled value
      */
@@ -229,7 +229,7 @@ public Boolean writeAcceleratorEnabled() {
     }
 
     /**
-     * Set the writeAcceleratorEnabled value.
+     * Set specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @param writeAcceleratorEnabled the writeAcceleratorEnabled value to set
      * @return the OSDisk object itself.
@@ -240,7 +240,7 @@ public OSDisk withWriteAcceleratorEnabled(Boolean writeAcceleratorEnabled) {
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -249,7 +249,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machine should be created.&lt;br&gt;&lt;br&gt; Possible values are:&lt;br&gt;&lt;br&gt; **Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.&lt;br&gt;&lt;br&gt; **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the OSDisk object itself.
@@ -260,7 +260,7 @@ public OSDisk withCreateOption(DiskCreateOptionTypes createOption) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -269,7 +269,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the OSDisk object itself.
@@ -280,7 +280,7 @@ public OSDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -289,7 +289,7 @@ public ManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the OSDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDiskImage.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDiskImage.java
index 38d51530f40c..bf17d019ec67 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDiskImage.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSDiskImage.java
@@ -22,7 +22,7 @@ public class OSDiskImage {
     private OperatingSystemTypes operatingSystem;
 
     /**
-     * Get the operatingSystem value.
+     * Get the operating system of the osDiskImage. Possible values include: 'Windows', 'Linux'.
      *
      * @return the operatingSystem value
      */
@@ -31,7 +31,7 @@ public OperatingSystemTypes operatingSystem() {
     }
 
     /**
-     * Set the operatingSystem value.
+     * Set the operating system of the osDiskImage. Possible values include: 'Windows', 'Linux'.
      *
      * @param operatingSystem the operatingSystem value to set
      * @return the OSDiskImage object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSProfile.java
index f4489702f4f1..cd0a248ce850 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/OSProfile.java
@@ -106,7 +106,7 @@ public class OSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the computerName value.
+     * Get specifies the host OS name of the virtual machine. &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 15 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters. &lt;br&gt;&lt;br&gt; For naming conventions and restrictions see [Azure infrastructure services implementation guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
      *
      * @return the computerName value
      */
@@ -115,7 +115,7 @@ public String computerName() {
     }
 
     /**
-     * Set the computerName value.
+     * Set specifies the host OS name of the virtual machine. &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 15 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters. &lt;br&gt;&lt;br&gt; For naming conventions and restrictions see [Azure infrastructure services implementation guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
      *
      * @param computerName the computerName value to set
      * @return the OSProfile object itself.
@@ -126,7 +126,7 @@ public OSProfile withComputerName(String computerName) {
     }
 
     /**
-     * Get the adminUsername value.
+     * Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the adminUsername value
      */
@@ -135,7 +135,7 @@ public String adminUsername() {
     }
 
     /**
-     * Set the adminUsername value.
+     * Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param adminUsername the adminUsername value to set
      * @return the OSProfile object itself.
@@ -146,7 +146,7 @@ public OSProfile withAdminUsername(String adminUsername) {
     }
 
     /**
-     * Get the adminPassword value.
+     * Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @return the adminPassword value
      */
@@ -155,7 +155,7 @@ public String adminPassword() {
     }
 
     /**
-     * Set the adminPassword value.
+     * Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @param adminPassword the adminPassword value to set
      * @return the OSProfile object itself.
@@ -166,7 +166,7 @@ public OSProfile withAdminPassword(String adminPassword) {
     }
 
     /**
-     * Get the customData value.
+     * Get specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the customData value
      */
@@ -175,7 +175,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param customData the customData value to set
      * @return the OSProfile object itself.
@@ -186,7 +186,7 @@ public OSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get specifies Windows operating system settings on the virtual machine.
      *
      * @return the windowsConfiguration value
      */
@@ -195,7 +195,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set specifies Windows operating system settings on the virtual machine.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the OSProfile object itself.
@@ -206,7 +206,7 @@ public OSProfile withWindowsConfiguration(WindowsConfiguration windowsConfigurat
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the linuxConfiguration value
      */
@@ -215,7 +215,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the OSProfile object itself.
@@ -226,7 +226,7 @@ public OSProfile withLinuxConfiguration(LinuxConfiguration linuxConfiguration) {
     }
 
     /**
-     * Get the secrets value.
+     * Get specifies set of certificates that should be installed onto the virtual machine.
      *
      * @return the secrets value
      */
@@ -235,7 +235,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set specifies set of certificates that should be installed onto the virtual machine.
      *
      * @param secrets the secrets value to set
      * @return the OSProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Plan.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Plan.java
index 706959e783f6..c558718b558e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Plan.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Plan.java
@@ -45,7 +45,7 @@ public class Plan {
     private String promotionCode;
 
     /**
-     * Get the name value.
+     * Get the plan ID.
      *
      * @return the name value
      */
@@ -54,7 +54,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the plan ID.
      *
      * @param name the name value to set
      * @return the Plan object itself.
@@ -65,7 +65,7 @@ public Plan withName(String name) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the publisher ID.
      *
      * @return the publisher value
      */
@@ -74,7 +74,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the publisher ID.
      *
      * @param publisher the publisher value to set
      * @return the Plan object itself.
@@ -85,7 +85,7 @@ public Plan withPublisher(String publisher) {
     }
 
     /**
-     * Get the product value.
+     * Get specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @return the product value
      */
@@ -94,7 +94,7 @@ public String product() {
     }
 
     /**
-     * Set the product value.
+     * Set specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @param product the product value to set
      * @return the Plan object itself.
@@ -105,7 +105,7 @@ public Plan withProduct(String product) {
     }
 
     /**
-     * Get the promotionCode value.
+     * Get the promotion code.
      *
      * @return the promotionCode value
      */
@@ -114,7 +114,7 @@ public String promotionCode() {
     }
 
     /**
-     * Set the promotionCode value.
+     * Set the promotion code.
      *
      * @param promotionCode the promotionCode value to set
      * @return the Plan object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/PurchasePlan.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/PurchasePlan.java
index 2c35d99d844d..07ecdb4dff25 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/PurchasePlan.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/PurchasePlan.java
@@ -35,7 +35,7 @@ public class PurchasePlan {
     private String product;
 
     /**
-     * Get the publisher value.
+     * Get the publisher ID.
      *
      * @return the publisher value
      */
@@ -44,7 +44,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the publisher ID.
      *
      * @param publisher the publisher value to set
      * @return the PurchasePlan object itself.
@@ -55,7 +55,7 @@ public PurchasePlan withPublisher(String publisher) {
     }
 
     /**
-     * Get the name value.
+     * Get the plan ID.
      *
      * @return the name value
      */
@@ -64,7 +64,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the plan ID.
      *
      * @param name the name value to set
      * @return the PurchasePlan object itself.
@@ -75,7 +75,7 @@ public PurchasePlan withName(String name) {
     }
 
     /**
-     * Get the product value.
+     * Get specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @return the product value
      */
@@ -84,7 +84,7 @@ public String product() {
     }
 
     /**
-     * Set the product value.
+     * Set specifies the product of the image from the marketplace. This is the same value as Offer under the imageReference element.
      *
      * @param product the product value to set
      * @return the PurchasePlan object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RequestRateByIntervalInput.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RequestRateByIntervalInput.java
index bf1a991b190e..d1511a067772 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RequestRateByIntervalInput.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RequestRateByIntervalInput.java
@@ -23,7 +23,7 @@ public class RequestRateByIntervalInput extends LogAnalyticsInputBase {
     private IntervalInMins intervalLength;
 
     /**
-     * Get the intervalLength value.
+     * Get interval value in minutes used to create LogAnalytics call rate logs. Possible values include: 'ThreeMins', 'FiveMins', 'ThirtyMins', 'SixtyMins'.
      *
      * @return the intervalLength value
      */
@@ -32,7 +32,7 @@ public IntervalInMins intervalLength() {
     }
 
     /**
-     * Set the intervalLength value.
+     * Set interval value in minutes used to create LogAnalytics call rate logs. Possible values include: 'ThreeMins', 'FiveMins', 'ThirtyMins', 'SixtyMins'.
      *
      * @param intervalLength the intervalLength value to set
      * @return the RequestRateByIntervalInput object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollbackStatusInfo.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollbackStatusInfo.java
index 8207a42eda11..db0955bfd4d4 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollbackStatusInfo.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollbackStatusInfo.java
@@ -34,7 +34,7 @@ public class RollbackStatusInfo {
     private ApiError rollbackError;
 
     /**
-     * Get the successfullyRolledbackInstanceCount value.
+     * Get the number of instances which have been successfully rolled back.
      *
      * @return the successfullyRolledbackInstanceCount value
      */
@@ -43,7 +43,7 @@ public Integer successfullyRolledbackInstanceCount() {
     }
 
     /**
-     * Get the failedRolledbackInstanceCount value.
+     * Get the number of instances which failed to rollback.
      *
      * @return the failedRolledbackInstanceCount value
      */
@@ -52,7 +52,7 @@ public Integer failedRolledbackInstanceCount() {
     }
 
     /**
-     * Get the rollbackError value.
+     * Get error details if OS rollback failed.
      *
      * @return the rollbackError value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradePolicy.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradePolicy.java
index 999b0e8ea431..359050d4bde2 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradePolicy.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradePolicy.java
@@ -53,7 +53,7 @@ public class RollingUpgradePolicy {
     private String pauseTimeBetweenBatches;
 
     /**
-     * Get the maxBatchInstancePercent value.
+     * Get the maximum percent of total virtual machine instances that will be upgraded simultaneously by the rolling upgrade in one batch. As this is a maximum, unhealthy instances in previous or future batches can cause the percentage of instances in a batch to decrease to ensure higher reliability. The default value for this parameter is 20%.
      *
      * @return the maxBatchInstancePercent value
      */
@@ -62,7 +62,7 @@ public Integer maxBatchInstancePercent() {
     }
 
     /**
-     * Set the maxBatchInstancePercent value.
+     * Set the maximum percent of total virtual machine instances that will be upgraded simultaneously by the rolling upgrade in one batch. As this is a maximum, unhealthy instances in previous or future batches can cause the percentage of instances in a batch to decrease to ensure higher reliability. The default value for this parameter is 20%.
      *
      * @param maxBatchInstancePercent the maxBatchInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -73,7 +73,7 @@ public RollingUpgradePolicy withMaxBatchInstancePercent(Integer maxBatchInstance
     }
 
     /**
-     * Get the maxUnhealthyInstancePercent value.
+     * Get the maximum percentage of the total virtual machine instances in the scale set that can be simultaneously unhealthy, either as a result of being upgraded, or by being found in an unhealthy state by the virtual machine health checks before the rolling upgrade aborts. This constraint will be checked prior to starting any batch. The default value for this parameter is 20%.
      *
      * @return the maxUnhealthyInstancePercent value
      */
@@ -82,7 +82,7 @@ public Integer maxUnhealthyInstancePercent() {
     }
 
     /**
-     * Set the maxUnhealthyInstancePercent value.
+     * Set the maximum percentage of the total virtual machine instances in the scale set that can be simultaneously unhealthy, either as a result of being upgraded, or by being found in an unhealthy state by the virtual machine health checks before the rolling upgrade aborts. This constraint will be checked prior to starting any batch. The default value for this parameter is 20%.
      *
      * @param maxUnhealthyInstancePercent the maxUnhealthyInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -93,7 +93,7 @@ public RollingUpgradePolicy withMaxUnhealthyInstancePercent(Integer maxUnhealthy
     }
 
     /**
-     * Get the maxUnhealthyUpgradedInstancePercent value.
+     * Get the maximum percentage of upgraded virtual machine instances that can be found to be in an unhealthy state. This check will happen after each batch is upgraded. If this percentage is ever exceeded, the rolling update aborts. The default value for this parameter is 20%.
      *
      * @return the maxUnhealthyUpgradedInstancePercent value
      */
@@ -102,7 +102,7 @@ public Integer maxUnhealthyUpgradedInstancePercent() {
     }
 
     /**
-     * Set the maxUnhealthyUpgradedInstancePercent value.
+     * Set the maximum percentage of upgraded virtual machine instances that can be found to be in an unhealthy state. This check will happen after each batch is upgraded. If this percentage is ever exceeded, the rolling update aborts. The default value for this parameter is 20%.
      *
      * @param maxUnhealthyUpgradedInstancePercent the maxUnhealthyUpgradedInstancePercent value to set
      * @return the RollingUpgradePolicy object itself.
@@ -113,7 +113,7 @@ public RollingUpgradePolicy withMaxUnhealthyUpgradedInstancePercent(Integer maxU
     }
 
     /**
-     * Get the pauseTimeBetweenBatches value.
+     * Get the wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S).
      *
      * @return the pauseTimeBetweenBatches value
      */
@@ -122,7 +122,7 @@ public String pauseTimeBetweenBatches() {
     }
 
     /**
-     * Set the pauseTimeBetweenBatches value.
+     * Set the wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format. The default value is 0 seconds (PT0S).
      *
      * @param pauseTimeBetweenBatches the pauseTimeBetweenBatches value to set
      * @return the RollingUpgradePolicy object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeProgressInfo.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeProgressInfo.java
index fe594d70d731..d683e53001f6 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeProgressInfo.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeProgressInfo.java
@@ -40,7 +40,7 @@ public class RollingUpgradeProgressInfo {
     private Integer pendingInstanceCount;
 
     /**
-     * Get the successfulInstanceCount value.
+     * Get the number of instances that have been successfully upgraded.
      *
      * @return the successfulInstanceCount value
      */
@@ -49,7 +49,7 @@ public Integer successfulInstanceCount() {
     }
 
     /**
-     * Get the failedInstanceCount value.
+     * Get the number of instances that have failed to be upgraded successfully.
      *
      * @return the failedInstanceCount value
      */
@@ -58,7 +58,7 @@ public Integer failedInstanceCount() {
     }
 
     /**
-     * Get the inProgressInstanceCount value.
+     * Get the number of instances that are currently being upgraded.
      *
      * @return the inProgressInstanceCount value
      */
@@ -67,7 +67,7 @@ public Integer inProgressInstanceCount() {
     }
 
     /**
-     * Get the pendingInstanceCount value.
+     * Get the number of instances that have not yet begun to be upgraded.
      *
      * @return the pendingInstanceCount value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeRunningStatus.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeRunningStatus.java
index d54aa47da1b8..e1b9cf54f0e2 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeRunningStatus.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RollingUpgradeRunningStatus.java
@@ -42,7 +42,7 @@ public class RollingUpgradeRunningStatus {
     private DateTime lastActionTime;
 
     /**
-     * Get the code value.
+     * Get code indicating the current status of the upgrade. Possible values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'.
      *
      * @return the code value
      */
@@ -51,7 +51,7 @@ public RollingUpgradeStatusCode code() {
     }
 
     /**
-     * Get the startTime value.
+     * Get start time of the upgrade.
      *
      * @return the startTime value
      */
@@ -60,7 +60,7 @@ public DateTime startTime() {
     }
 
     /**
-     * Get the lastAction value.
+     * Get the last action performed on the rolling upgrade. Possible values include: 'Start', 'Cancel'.
      *
      * @return the lastAction value
      */
@@ -69,7 +69,7 @@ public RollingUpgradeActionType lastAction() {
     }
 
     /**
-     * Get the lastActionTime value.
+     * Get last action time of the upgrade.
      *
      * @return the lastActionTime value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInput.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInput.java
index 5c66fe6db133..d0bdd3cc2471 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInput.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInput.java
@@ -35,7 +35,7 @@ public class RunCommandInput {
     private List<RunCommandInputParameter> parameters;
 
     /**
-     * Get the commandId value.
+     * Get the run command id.
      *
      * @return the commandId value
      */
@@ -44,7 +44,7 @@ public String commandId() {
     }
 
     /**
-     * Set the commandId value.
+     * Set the run command id.
      *
      * @param commandId the commandId value to set
      * @return the RunCommandInput object itself.
@@ -55,7 +55,7 @@ public RunCommandInput withCommandId(String commandId) {
     }
 
     /**
-     * Get the script value.
+     * Get optional. The script to be executed.  When this value is given, the given script will override the default script of the command.
      *
      * @return the script value
      */
@@ -64,7 +64,7 @@ public List<String> script() {
     }
 
     /**
-     * Set the script value.
+     * Set optional. The script to be executed.  When this value is given, the given script will override the default script of the command.
      *
      * @param script the script value to set
      * @return the RunCommandInput object itself.
@@ -75,7 +75,7 @@ public RunCommandInput withScript(List<String> script) {
     }
 
     /**
-     * Get the parameters value.
+     * Get the run command parameters.
      *
      * @return the parameters value
      */
@@ -84,7 +84,7 @@ public List<RunCommandInputParameter> parameters() {
     }
 
     /**
-     * Set the parameters value.
+     * Set the run command parameters.
      *
      * @param parameters the parameters value to set
      * @return the RunCommandInput object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInputParameter.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInputParameter.java
index 7e18c716d015..6027c0967754 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInputParameter.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandInputParameter.java
@@ -27,7 +27,7 @@ public class RunCommandInputParameter {
     private String value;
 
     /**
-     * Get the name value.
+     * Get the run command parameter name.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the run command parameter name.
      *
      * @param name the name value to set
      * @return the RunCommandInputParameter object itself.
@@ -47,7 +47,7 @@ public RunCommandInputParameter withName(String name) {
     }
 
     /**
-     * Get the value value.
+     * Get the run command parameter value.
      *
      * @return the value value
      */
@@ -56,7 +56,7 @@ public String value() {
     }
 
     /**
-     * Set the value value.
+     * Set the run command parameter value.
      *
      * @param value the value value to set
      * @return the RunCommandInputParameter object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandParameterDefinition.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandParameterDefinition.java
index 902143de1f2a..2a363b3103d6 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandParameterDefinition.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/RunCommandParameterDefinition.java
@@ -39,7 +39,7 @@ public class RunCommandParameterDefinition {
     private Boolean required;
 
     /**
-     * Get the name value.
+     * Get the run command parameter name.
      *
      * @return the name value
      */
@@ -48,7 +48,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the run command parameter name.
      *
      * @param name the name value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -59,7 +59,7 @@ public RunCommandParameterDefinition withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get the run command parameter type.
      *
      * @return the type value
      */
@@ -68,7 +68,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the run command parameter type.
      *
      * @param type the type value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -79,7 +79,7 @@ public RunCommandParameterDefinition withType(String type) {
     }
 
     /**
-     * Get the defaultValue value.
+     * Get the run command parameter default value.
      *
      * @return the defaultValue value
      */
@@ -88,7 +88,7 @@ public String defaultValue() {
     }
 
     /**
-     * Set the defaultValue value.
+     * Set the run command parameter default value.
      *
      * @param defaultValue the defaultValue value to set
      * @return the RunCommandParameterDefinition object itself.
@@ -99,7 +99,7 @@ public RunCommandParameterDefinition withDefaultValue(String defaultValue) {
     }
 
     /**
-     * Get the required value.
+     * Get the run command parameter required.
      *
      * @return the required value
      */
@@ -108,7 +108,7 @@ public Boolean required() {
     }
 
     /**
-     * Set the required value.
+     * Set the run command parameter required.
      *
      * @param required the required value to set
      * @return the RunCommandParameterDefinition object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Sku.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Sku.java
index 35f2570273dc..6ebaaff19274 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Sku.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/Sku.java
@@ -35,7 +35,7 @@ public class Sku {
     private Long capacity;
 
     /**
-     * Get the name value.
+     * Get the sku name.
      *
      * @return the name value
      */
@@ -44,7 +44,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the sku name.
      *
      * @param name the name value to set
      * @return the Sku object itself.
@@ -55,7 +55,7 @@ public Sku withName(String name) {
     }
 
     /**
-     * Get the tier value.
+     * Get specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @return the tier value
      */
@@ -64,7 +64,7 @@ public String tier() {
     }
 
     /**
-     * Set the tier value.
+     * Set specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @param tier the tier value to set
      * @return the Sku object itself.
@@ -75,7 +75,7 @@ public Sku withTier(String tier) {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
@@ -84,7 +84,7 @@ public Long capacity() {
     }
 
     /**
-     * Set the capacity value.
+     * Set specifies the number of virtual machines in the scale set.
      *
      * @param capacity the capacity value to set
      * @return the Sku object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshConfiguration.java
index be0ba2e5a809..62efd514bf07 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshConfiguration.java
@@ -22,7 +22,7 @@ public class SshConfiguration {
     private List<SshPublicKey> publicKeys;
 
     /**
-     * Get the publicKeys value.
+     * Get the list of SSH public keys used to authenticate with linux based VMs.
      *
      * @return the publicKeys value
      */
@@ -31,7 +31,7 @@ public List<SshPublicKey> publicKeys() {
     }
 
     /**
-     * Set the publicKeys value.
+     * Set the list of SSH public keys used to authenticate with linux based VMs.
      *
      * @param publicKeys the publicKeys value to set
      * @return the SshConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshPublicKey.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshPublicKey.java
index 974bab7868b0..50b9a336e3ec 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshPublicKey.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SshPublicKey.java
@@ -34,7 +34,7 @@ public class SshPublicKey {
     private String keyData;
 
     /**
-     * Get the path value.
+     * Get specifies the full path on the created VM where ssh public key is stored. If the file already exists, the specified key is appended to the file. Example: /home/user/.ssh/authorized_keys.
      *
      * @return the path value
      */
@@ -43,7 +43,7 @@ public String path() {
     }
 
     /**
-     * Set the path value.
+     * Set specifies the full path on the created VM where ssh public key is stored. If the file already exists, the specified key is appended to the file. Example: /home/user/.ssh/authorized_keys.
      *
      * @param path the path value to set
      * @return the SshPublicKey object itself.
@@ -54,7 +54,7 @@ public SshPublicKey withPath(String path) {
     }
 
     /**
-     * Get the keyData value.
+     * Get sSH public key certificate used to authenticate with the VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa format. &lt;br&gt;&lt;br&gt; For creating ssh keys, see [Create SSH keys on Linux and Mac for Linux VMs in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the keyData value
      */
@@ -63,7 +63,7 @@ public String keyData() {
     }
 
     /**
-     * Set the keyData value.
+     * Set sSH public key certificate used to authenticate with the VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa format. &lt;br&gt;&lt;br&gt; For creating ssh keys, see [Create SSH keys on Linux and Mac for Linux VMs in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param keyData the keyData value to set
      * @return the SshPublicKey object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/StorageProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/StorageProfile.java
index 7ec35f671971..336f5dbe3f48 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/StorageProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/StorageProfile.java
@@ -44,7 +44,7 @@ public class StorageProfile {
     private List<DataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @return the imageReference value
      */
@@ -53,7 +53,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @param imageReference the imageReference value to set
      * @return the StorageProfile object itself.
@@ -64,7 +64,7 @@ public StorageProfile withImageReference(ImageReference imageReference) {
     }
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -73,7 +73,7 @@ public OSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the StorageProfile object itself.
@@ -84,7 +84,7 @@ public StorageProfile withOsDisk(OSDisk osDisk) {
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -93,7 +93,7 @@ public List<DataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add a data disk to a virtual machine. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the StorageProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SubResourceReadOnly.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SubResourceReadOnly.java
index e66fe0e581ee..80a1765517e9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SubResourceReadOnly.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/SubResourceReadOnly.java
@@ -21,7 +21,7 @@ public class SubResourceReadOnly {
     private String id;
 
     /**
-     * Get the id value.
+     * Get resource Id.
      *
      * @return the id value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpdateResource.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpdateResource.java
index 8808b169e2ce..1fb55920f690 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpdateResource.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpdateResource.java
@@ -22,7 +22,7 @@ public class UpdateResource {
     private Map<String, String> tags;
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -31,7 +31,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the UpdateResource object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoricalStatusInfoProperties.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoricalStatusInfoProperties.java
index 096b287640d6..3b26e8e0dec5 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoricalStatusInfoProperties.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoricalStatusInfoProperties.java
@@ -52,7 +52,7 @@ public class UpgradeOperationHistoricalStatusInfoProperties {
     private RollbackStatusInfo rollbackInfo;
 
     /**
-     * Get the runningStatus value.
+     * Get information about the overall status of the upgrade operation.
      *
      * @return the runningStatus value
      */
@@ -61,7 +61,7 @@ public UpgradeOperationHistoryStatus runningStatus() {
     }
 
     /**
-     * Get the progress value.
+     * Get counts of the VM's in each state.
      *
      * @return the progress value
      */
@@ -70,7 +70,7 @@ public RollingUpgradeProgressInfo progress() {
     }
 
     /**
-     * Get the error value.
+     * Get error Details for this upgrade if there are any.
      *
      * @return the error value
      */
@@ -79,7 +79,7 @@ public ApiError error() {
     }
 
     /**
-     * Get the startedBy value.
+     * Get invoker of the Upgrade Operation. Possible values include: 'Unknown', 'User', 'Platform'.
      *
      * @return the startedBy value
      */
@@ -88,7 +88,7 @@ public UpgradeOperationInvoker startedBy() {
     }
 
     /**
-     * Get the targetImageReference value.
+     * Get image Reference details.
      *
      * @return the targetImageReference value
      */
@@ -97,7 +97,7 @@ public ImageReference targetImageReference() {
     }
 
     /**
-     * Get the rollbackInfo value.
+     * Get information about OS rollback if performed.
      *
      * @return the rollbackInfo value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoryStatus.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoryStatus.java
index c013fe0b73de..8eead01d5506 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoryStatus.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradeOperationHistoryStatus.java
@@ -35,7 +35,7 @@ public class UpgradeOperationHistoryStatus {
     private DateTime endTime;
 
     /**
-     * Get the code value.
+     * Get code indicating the current status of the upgrade. Possible values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'.
      *
      * @return the code value
      */
@@ -44,7 +44,7 @@ public UpgradeState code() {
     }
 
     /**
-     * Get the startTime value.
+     * Get start time of the upgrade.
      *
      * @return the startTime value
      */
@@ -53,7 +53,7 @@ public DateTime startTime() {
     }
 
     /**
-     * Get the endTime value.
+     * Get end time of the upgrade.
      *
      * @return the endTime value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradePolicy.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradePolicy.java
index 3072edd998ab..9509b264727f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradePolicy.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UpgradePolicy.java
@@ -47,7 +47,7 @@ public class UpgradePolicy {
     private AutoOSUpgradePolicy autoOSUpgradePolicy;
 
     /**
-     * Get the mode value.
+     * Get specifies the mode of an upgrade to virtual machines in the scale set.&lt;br /&gt;&lt;br /&gt; Possible values are:&lt;br /&gt;&lt;br /&gt; **Manual** - You  control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action.&lt;br /&gt;&lt;br /&gt; **Automatic** - All virtual machines in the scale set are  automatically updated at the same time. Possible values include: 'Automatic', 'Manual', 'Rolling'.
      *
      * @return the mode value
      */
@@ -56,7 +56,7 @@ public UpgradeMode mode() {
     }
 
     /**
-     * Set the mode value.
+     * Set specifies the mode of an upgrade to virtual machines in the scale set.&lt;br /&gt;&lt;br /&gt; Possible values are:&lt;br /&gt;&lt;br /&gt; **Manual** - You  control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action.&lt;br /&gt;&lt;br /&gt; **Automatic** - All virtual machines in the scale set are  automatically updated at the same time. Possible values include: 'Automatic', 'Manual', 'Rolling'.
      *
      * @param mode the mode value to set
      * @return the UpgradePolicy object itself.
@@ -67,7 +67,7 @@ public UpgradePolicy withMode(UpgradeMode mode) {
     }
 
     /**
-     * Get the rollingUpgradePolicy value.
+     * Get the configuration parameters used while performing a rolling upgrade.
      *
      * @return the rollingUpgradePolicy value
      */
@@ -76,7 +76,7 @@ public RollingUpgradePolicy rollingUpgradePolicy() {
     }
 
     /**
-     * Set the rollingUpgradePolicy value.
+     * Set the configuration parameters used while performing a rolling upgrade.
      *
      * @param rollingUpgradePolicy the rollingUpgradePolicy value to set
      * @return the UpgradePolicy object itself.
@@ -87,7 +87,7 @@ public UpgradePolicy withRollingUpgradePolicy(RollingUpgradePolicy rollingUpgrad
     }
 
     /**
-     * Get the automaticOSUpgrade value.
+     * Get whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available.
      *
      * @return the automaticOSUpgrade value
      */
@@ -96,7 +96,7 @@ public Boolean automaticOSUpgrade() {
     }
 
     /**
-     * Set the automaticOSUpgrade value.
+     * Set whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the image becomes available.
      *
      * @param automaticOSUpgrade the automaticOSUpgrade value to set
      * @return the UpgradePolicy object itself.
@@ -107,7 +107,7 @@ public UpgradePolicy withAutomaticOSUpgrade(Boolean automaticOSUpgrade) {
     }
 
     /**
-     * Get the autoOSUpgradePolicy value.
+     * Get configuration parameters used for performing automatic OS Upgrade.
      *
      * @return the autoOSUpgradePolicy value
      */
@@ -116,7 +116,7 @@ public AutoOSUpgradePolicy autoOSUpgradePolicy() {
     }
 
     /**
-     * Set the autoOSUpgradePolicy value.
+     * Set configuration parameters used for performing automatic OS Upgrade.
      *
      * @param autoOSUpgradePolicy the autoOSUpgradePolicy value to set
      * @return the UpgradePolicy object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UsageName.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UsageName.java
index 3e4ae08bcd7a..a357996d2295 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UsageName.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/UsageName.java
@@ -27,7 +27,7 @@ public class UsageName {
     private String localizedValue;
 
     /**
-     * Get the value value.
+     * Get the name of the resource.
      *
      * @return the value value
      */
@@ -36,7 +36,7 @@ public String value() {
     }
 
     /**
-     * Set the value value.
+     * Set the name of the resource.
      *
      * @param value the value value to set
      * @return the UsageName object itself.
@@ -47,7 +47,7 @@ public UsageName withValue(String value) {
     }
 
     /**
-     * Get the localizedValue value.
+     * Get the localized name of the resource.
      *
      * @return the localizedValue value
      */
@@ -56,7 +56,7 @@ public String localizedValue() {
     }
 
     /**
-     * Set the localizedValue value.
+     * Set the localized name of the resource.
      *
      * @param localizedValue the localizedValue value to set
      * @return the UsageName object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultCertificate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultCertificate.java
index 59e13305a5e5..8282664d6d00 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultCertificate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultCertificate.java
@@ -43,7 +43,7 @@ public class VaultCertificate {
     private String certificateStore;
 
     /**
-     * Get the certificateUrl value.
+     * Get this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @return the certificateUrl value
      */
@@ -52,7 +52,7 @@ public String certificateUrl() {
     }
 
     /**
-     * Set the certificateUrl value.
+     * Set this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @param certificateUrl the certificateUrl value to set
      * @return the VaultCertificate object itself.
@@ -63,7 +63,7 @@ public VaultCertificate withCertificateUrl(String certificateUrl) {
     }
 
     /**
-     * Get the certificateStore value.
+     * Get for Windows VMs, specifies the certificate store on the Virtual Machine to which the certificate should be added. The specified certificate store is implicitly in the LocalMachine account. &lt;br&gt;&lt;br&gt;For Linux VMs, the certificate file is placed under the /var/lib/waagent directory, with the file name &lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and &lt;UppercaseThumbpring&gt;.prv for private key. Both of these files are .pem formatted.
      *
      * @return the certificateStore value
      */
@@ -72,7 +72,7 @@ public String certificateStore() {
     }
 
     /**
-     * Set the certificateStore value.
+     * Set for Windows VMs, specifies the certificate store on the Virtual Machine to which the certificate should be added. The specified certificate store is implicitly in the LocalMachine account. &lt;br&gt;&lt;br&gt;For Linux VMs, the certificate file is placed under the /var/lib/waagent directory, with the file name &lt;UppercaseThumbprint&gt;.crt for the X509 certificate file and &lt;UppercaseThumbpring&gt;.prv for private key. Both of these files are .pem formatted.
      *
      * @param certificateStore the certificateStore value to set
      * @return the VaultCertificate object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultSecretGroup.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultSecretGroup.java
index d335a0a37e0c..1a133a55dc81 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultSecretGroup.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VaultSecretGroup.java
@@ -31,7 +31,7 @@ public class VaultSecretGroup {
     private List<VaultCertificate> vaultCertificates;
 
     /**
-     * Get the sourceVault value.
+     * Get the relative URL of the Key Vault containing all of the certificates in VaultCertificates.
      *
      * @return the sourceVault value
      */
@@ -40,7 +40,7 @@ public SubResource sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set the relative URL of the Key Vault containing all of the certificates in VaultCertificates.
      *
      * @param sourceVault the sourceVault value to set
      * @return the VaultSecretGroup object itself.
@@ -51,7 +51,7 @@ public VaultSecretGroup withSourceVault(SubResource sourceVault) {
     }
 
     /**
-     * Get the vaultCertificates value.
+     * Get the list of key vault references in SourceVault which contain certificates.
      *
      * @return the vaultCertificates value
      */
@@ -60,7 +60,7 @@ public List<VaultCertificate> vaultCertificates() {
     }
 
     /**
-     * Set the vaultCertificates value.
+     * Set the list of key vault references in SourceVault which contain certificates.
      *
      * @param vaultCertificates the vaultCertificates value to set
      * @return the VaultSecretGroup object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualHardDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualHardDisk.java
index 6e765d76372c..268869d60c12 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualHardDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualHardDisk.java
@@ -21,7 +21,7 @@ public class VirtualHardDisk {
     private String uri;
 
     /**
-     * Get the uri value.
+     * Get specifies the virtual hard disk's uri.
      *
      * @return the uri value
      */
@@ -30,7 +30,7 @@ public String uri() {
     }
 
     /**
-     * Set the uri value.
+     * Set specifies the virtual hard disk's uri.
      *
      * @param uri the uri value to set
      * @return the VirtualHardDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
index 83f99f4007e2..259954b05cfa 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
 import com.microsoft.azure.SubResource;
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineAgentInstanceView.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineAgentInstanceView.java
index 156da0dfb183..30ffe785bc13 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineAgentInstanceView.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineAgentInstanceView.java
@@ -34,7 +34,7 @@ public class VirtualMachineAgentInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the vmAgentVersion value.
+     * Get the VM Agent full version.
      *
      * @return the vmAgentVersion value
      */
@@ -43,7 +43,7 @@ public String vmAgentVersion() {
     }
 
     /**
-     * Set the vmAgentVersion value.
+     * Set the VM Agent full version.
      *
      * @param vmAgentVersion the vmAgentVersion value to set
      * @return the VirtualMachineAgentInstanceView object itself.
@@ -54,7 +54,7 @@ public VirtualMachineAgentInstanceView withVmAgentVersion(String vmAgentVersion)
     }
 
     /**
-     * Get the extensionHandlers value.
+     * Get the virtual machine extension handler instance view.
      *
      * @return the extensionHandlers value
      */
@@ -63,7 +63,7 @@ public List<VirtualMachineExtensionHandlerInstanceView> extensionHandlers() {
     }
 
     /**
-     * Set the extensionHandlers value.
+     * Set the virtual machine extension handler instance view.
      *
      * @param extensionHandlers the extensionHandlers value to set
      * @return the VirtualMachineAgentInstanceView object itself.
@@ -74,7 +74,7 @@ public VirtualMachineAgentInstanceView withExtensionHandlers(List<VirtualMachine
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -83,7 +83,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineAgentInstanceView object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineCaptureParameters.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineCaptureParameters.java
index 50c508531712..4fe94993e26b 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineCaptureParameters.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineCaptureParameters.java
@@ -34,7 +34,7 @@ public class VirtualMachineCaptureParameters {
     private boolean overwriteVhds;
 
     /**
-     * Get the vhdPrefix value.
+     * Get the captured virtual hard disk's name prefix.
      *
      * @return the vhdPrefix value
      */
@@ -43,7 +43,7 @@ public String vhdPrefix() {
     }
 
     /**
-     * Set the vhdPrefix value.
+     * Set the captured virtual hard disk's name prefix.
      *
      * @param vhdPrefix the vhdPrefix value to set
      * @return the VirtualMachineCaptureParameters object itself.
@@ -54,7 +54,7 @@ public VirtualMachineCaptureParameters withVhdPrefix(String vhdPrefix) {
     }
 
     /**
-     * Get the destinationContainerName value.
+     * Get the destination container name.
      *
      * @return the destinationContainerName value
      */
@@ -63,7 +63,7 @@ public String destinationContainerName() {
     }
 
     /**
-     * Set the destinationContainerName value.
+     * Set the destination container name.
      *
      * @param destinationContainerName the destinationContainerName value to set
      * @return the VirtualMachineCaptureParameters object itself.
@@ -74,7 +74,7 @@ public VirtualMachineCaptureParameters withDestinationContainerName(String desti
     }
 
     /**
-     * Get the overwriteVhds value.
+     * Get specifies whether to overwrite the destination virtual hard disk, in case of conflict.
      *
      * @return the overwriteVhds value
      */
@@ -83,7 +83,7 @@ public boolean overwriteVhds() {
     }
 
     /**
-     * Set the overwriteVhds value.
+     * Set specifies whether to overwrite the destination virtual hard disk, in case of conflict.
      *
      * @param overwriteVhds the overwriteVhds value to set
      * @return the VirtualMachineCaptureParameters object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionHandlerInstanceView.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionHandlerInstanceView.java
index 3f556377c748..9d07f64defed 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionHandlerInstanceView.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionHandlerInstanceView.java
@@ -34,7 +34,7 @@ public class VirtualMachineExtensionHandlerInstanceView {
     private InstanceViewStatus status;
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -43,7 +43,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
@@ -54,7 +54,7 @@ public VirtualMachineExtensionHandlerInstanceView withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -63,7 +63,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
@@ -74,7 +74,7 @@ public VirtualMachineExtensionHandlerInstanceView withTypeHandlerVersion(String
     }
 
     /**
-     * Get the status value.
+     * Get the extension handler status.
      *
      * @return the status value
      */
@@ -83,7 +83,7 @@ public InstanceViewStatus status() {
     }
 
     /**
-     * Set the status value.
+     * Set the extension handler status.
      *
      * @param status the status value to set
      * @return the VirtualMachineExtensionHandlerInstanceView object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionInstanceView.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionInstanceView.java
index fb61f04c3eb7..d52e0ea12b1f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionInstanceView.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionInstanceView.java
@@ -47,7 +47,7 @@ public class VirtualMachineExtensionInstanceView {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the name value.
+     * Get the virtual machine extension name.
      *
      * @return the name value
      */
@@ -56,7 +56,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the virtual machine extension name.
      *
      * @param name the name value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -67,7 +67,7 @@ public VirtualMachineExtensionInstanceView withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -76,7 +76,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -87,7 +87,7 @@ public VirtualMachineExtensionInstanceView withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -96,7 +96,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -107,7 +107,7 @@ public VirtualMachineExtensionInstanceView withTypeHandlerVersion(String typeHan
     }
 
     /**
-     * Get the substatuses value.
+     * Get the resource status information.
      *
      * @return the substatuses value
      */
@@ -116,7 +116,7 @@ public List<InstanceViewStatus> substatuses() {
     }
 
     /**
-     * Set the substatuses value.
+     * Set the resource status information.
      *
      * @param substatuses the substatuses value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
@@ -127,7 +127,7 @@ public VirtualMachineExtensionInstanceView withSubstatuses(List<InstanceViewStat
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -136,7 +136,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineExtensionInstanceView object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionUpdate.java
index e13c73f1e495..0e7ee520fb03 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensionUpdate.java
@@ -65,7 +65,7 @@ public class VirtualMachineExtensionUpdate extends UpdateResource {
     private Object protectedSettings;
 
     /**
-     * Get the forceUpdateTag value.
+     * Get how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -74,7 +74,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -85,7 +85,7 @@ public VirtualMachineExtensionUpdate withForceUpdateTag(String forceUpdateTag) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -94,7 +94,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -105,7 +105,7 @@ public VirtualMachineExtensionUpdate withPublisher(String publisher) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -114,7 +114,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -125,7 +125,7 @@ public VirtualMachineExtensionUpdate withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -134,7 +134,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -145,7 +145,7 @@ public VirtualMachineExtensionUpdate withTypeHandlerVersion(String typeHandlerVe
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -154,7 +154,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -165,7 +165,7 @@ public VirtualMachineExtensionUpdate withAutoUpgradeMinorVersion(Boolean autoUpg
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -174,7 +174,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineExtensionUpdate object itself.
@@ -185,7 +185,7 @@ public VirtualMachineExtensionUpdate withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -194,7 +194,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineExtensionUpdate object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineHealthStatus.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineHealthStatus.java
index b9c7c6b1fe99..7b9080432236 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineHealthStatus.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineHealthStatus.java
@@ -21,7 +21,7 @@ public class VirtualMachineHealthStatus {
     private InstanceViewStatus status;
 
     /**
-     * Get the status value.
+     * Get the health status information for the VM.
      *
      * @return the status value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineIdentity.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineIdentity.java
index 04e0d23f7d4b..1fa8534a402e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineIdentity.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineIdentity.java
@@ -49,7 +49,7 @@ public class VirtualMachineIdentity {
     private List<String> identityIds;
 
     /**
-     * Get the principalId value.
+     * Get the principal id of virtual machine identity. This property will only be provided for a system assigned identity.
      *
      * @return the principalId value
      */
@@ -58,7 +58,7 @@ public String principalId() {
     }
 
     /**
-     * Get the tenantId value.
+     * Get the tenant id associated with the virtual machine. This property will only be provided for a system assigned identity.
      *
      * @return the tenantId value
      */
@@ -67,7 +67,7 @@ public String tenantId() {
     }
 
     /**
-     * Get the type value.
+     * Get the type of identity used for the virtual machine. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
      *
      * @return the type value
      */
@@ -76,7 +76,7 @@ public ResourceIdentityType type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of identity used for the virtual machine. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
      *
      * @param type the type value to set
      * @return the VirtualMachineIdentity object itself.
@@ -87,7 +87,7 @@ public VirtualMachineIdentity withType(ResourceIdentityType type) {
     }
 
     /**
-     * Get the identityIds value.
+     * Get the list of user identities associated with the Virtual Machine. The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
      *
      * @return the identityIds value
      */
@@ -96,7 +96,7 @@ public List<String> identityIds() {
     }
 
     /**
-     * Set the identityIds value.
+     * Set the list of user identities associated with the Virtual Machine. The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
      *
      * @param identityIds the identityIds value to set
      * @return the VirtualMachineIdentity object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSet.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSet.java
index 953bad5b6f46..fb47a4a4631c 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSet.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSet.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetDataDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetDataDisk.java
index 6a89052b6d82..f4af16f1e8dd 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetDataDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetDataDisk.java
@@ -54,7 +54,7 @@ public class VirtualMachineScaleSetDataDisk {
 
     /**
      * Specifies the size of an empty data disk in gigabytes. This element can
-     * be used to overwrite the name of the disk in a virtual machine image.
+     * be used to overwrite the size of the disk in a virtual machine image.
      * &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      */
     @JsonProperty(value = "diskSizeGB")
@@ -67,7 +67,7 @@ public class VirtualMachineScaleSetDataDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -76,7 +76,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -87,7 +87,7 @@ public VirtualMachineScaleSetDataDisk withName(String name) {
     }
 
     /**
-     * Get the lun value.
+     * Get specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @return the lun value
      */
@@ -96,7 +96,7 @@ public int lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set specifies the logical unit number of the data disk. This value is used to identify data disks within the VM and therefore must be unique for each data disk attached to a VM.
      *
      * @param lun the lun value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -107,7 +107,7 @@ public VirtualMachineScaleSetDataDisk withLun(int lun) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -116,7 +116,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -127,7 +127,7 @@ public VirtualMachineScaleSetDataDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the writeAcceleratorEnabled value.
+     * Get specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @return the writeAcceleratorEnabled value
      */
@@ -136,7 +136,7 @@ public Boolean writeAcceleratorEnabled() {
     }
 
     /**
-     * Set the writeAcceleratorEnabled value.
+     * Set specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @param writeAcceleratorEnabled the writeAcceleratorEnabled value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -147,7 +147,7 @@ public VirtualMachineScaleSetDataDisk withWriteAcceleratorEnabled(Boolean writeA
     }
 
     /**
-     * Get the createOption value.
+     * Get the create option. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -156,7 +156,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set the create option. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -167,7 +167,7 @@ public VirtualMachineScaleSetDataDisk withCreateOption(DiskCreateOptionTypes cre
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @return the diskSizeGB value
      */
@@ -176,7 +176,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the size of the disk in a virtual machine image. &lt;br&gt;&lt;br&gt; This value cannot be larger than 1023 GB.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
@@ -187,7 +187,7 @@ public VirtualMachineScaleSetDataDisk withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -196,7 +196,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetDataDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetExtensionProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetExtensionProfile.java
index 4ae80e5e54a8..4ee5c605bd15 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetExtensionProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetExtensionProfile.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetExtensionProfile {
     private List<VirtualMachineScaleSetExtensionInner> extensions;
 
     /**
-     * Get the extensions value.
+     * Get the virtual machine scale set child extension resources.
      *
      * @return the extensions value
      */
@@ -32,7 +32,7 @@ public List<VirtualMachineScaleSetExtensionInner> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the virtual machine scale set child extension resources.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineScaleSetExtensionProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIPConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIPConfiguration.java
index e900b48a195f..c2eb7449e57a 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIPConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIPConfiguration.java
@@ -80,7 +80,7 @@ public class VirtualMachineScaleSetIPConfiguration extends SubResource {
     private List<SubResource> loadBalancerInboundNatPools;
 
     /**
-     * Get the name value.
+     * Get the IP configuration name.
      *
      * @return the name value
      */
@@ -89,7 +89,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the IP configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetIPConfiguration withName(String name) {
     }
 
     /**
-     * Get the subnet value.
+     * Get specifies the identifier of the subnet.
      *
      * @return the subnet value
      */
@@ -109,7 +109,7 @@ public ApiEntityReference subnet() {
     }
 
     /**
-     * Set the subnet value.
+     * Set specifies the identifier of the subnet.
      *
      * @param subnet the subnet value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -120,7 +120,7 @@ public VirtualMachineScaleSetIPConfiguration withSubnet(ApiEntityReference subne
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -129,7 +129,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetIPConfiguration withPrimary(Boolean primary) {
     }
 
     /**
-     * Get the publicIPAddressConfiguration value.
+     * Get the publicIPAddressConfiguration.
      *
      * @return the publicIPAddressConfiguration value
      */
@@ -149,7 +149,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration publicIPAddressConfigu
     }
 
     /**
-     * Set the publicIPAddressConfiguration value.
+     * Set the publicIPAddressConfiguration.
      *
      * @param publicIPAddressConfiguration the publicIPAddressConfiguration value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -160,7 +160,7 @@ public VirtualMachineScaleSetIPConfiguration withPublicIPAddressConfiguration(Vi
     }
 
     /**
-     * Get the privateIPAddressVersion value.
+     * Get available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @return the privateIPAddressVersion value
      */
@@ -169,7 +169,7 @@ public IPVersion privateIPAddressVersion() {
     }
 
     /**
-     * Set the privateIPAddressVersion value.
+     * Set available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @param privateIPAddressVersion the privateIPAddressVersion value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -180,7 +180,7 @@ public VirtualMachineScaleSetIPConfiguration withPrivateIPAddressVersion(IPVersi
     }
 
     /**
-     * Get the applicationGatewayBackendAddressPools value.
+     * Get specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets cannot use the same application gateway.
      *
      * @return the applicationGatewayBackendAddressPools value
      */
@@ -189,7 +189,7 @@ public List<SubResource> applicationGatewayBackendAddressPools() {
     }
 
     /**
-     * Set the applicationGatewayBackendAddressPools value.
+     * Set specifies an array of references to backend address pools of application gateways. A scale set can reference backend address pools of multiple application gateways. Multiple scale sets cannot use the same application gateway.
      *
      * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -200,7 +200,7 @@ public VirtualMachineScaleSetIPConfiguration withApplicationGatewayBackendAddres
     }
 
     /**
-     * Get the loadBalancerBackendAddressPools value.
+     * Get specifies an array of references to backend address pools of load balancers. A scale set can reference backend address pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @return the loadBalancerBackendAddressPools value
      */
@@ -209,7 +209,7 @@ public List<SubResource> loadBalancerBackendAddressPools() {
     }
 
     /**
-     * Set the loadBalancerBackendAddressPools value.
+     * Set specifies an array of references to backend address pools of load balancers. A scale set can reference backend address pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
@@ -220,7 +220,7 @@ public VirtualMachineScaleSetIPConfiguration withLoadBalancerBackendAddressPools
     }
 
     /**
-     * Get the loadBalancerInboundNatPools value.
+     * Get specifies an array of references to inbound Nat pools of the load balancers. A scale set can reference inbound nat pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @return the loadBalancerInboundNatPools value
      */
@@ -229,7 +229,7 @@ public List<SubResource> loadBalancerInboundNatPools() {
     }
 
     /**
-     * Set the loadBalancerInboundNatPools value.
+     * Set specifies an array of references to inbound Nat pools of the load balancers. A scale set can reference inbound nat pools of one public and one internal load balancer. Multiple scale sets cannot use the same load balancer.
      *
      * @param loadBalancerInboundNatPools the loadBalancerInboundNatPools value to set
      * @return the VirtualMachineScaleSetIPConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIdentity.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIdentity.java
index ae3f99507ab3..c9dfba41d0c8 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIdentity.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetIdentity.java
@@ -49,7 +49,7 @@ public class VirtualMachineScaleSetIdentity {
     private List<String> identityIds;
 
     /**
-     * Get the principalId value.
+     * Get the principal id of virtual machine scale set identity. This property will only be provided for a system assigned identity.
      *
      * @return the principalId value
      */
@@ -58,7 +58,7 @@ public String principalId() {
     }
 
     /**
-     * Get the tenantId value.
+     * Get the tenant id associated with the virtual machine scale set. This property will only be provided for a system assigned identity.
      *
      * @return the tenantId value
      */
@@ -67,7 +67,7 @@ public String tenantId() {
     }
 
     /**
-     * Get the type value.
+     * Get the type of identity used for the virtual machine scale set. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine scale set. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
      *
      * @return the type value
      */
@@ -76,7 +76,7 @@ public ResourceIdentityType type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of identity used for the virtual machine scale set. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine scale set. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'.
      *
      * @param type the type value to set
      * @return the VirtualMachineScaleSetIdentity object itself.
@@ -87,7 +87,7 @@ public VirtualMachineScaleSetIdentity withType(ResourceIdentityType type) {
     }
 
     /**
-     * Get the identityIds value.
+     * Get the list of user identities associated with the virtual machine scale set. The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
      *
      * @return the identityIds value
      */
@@ -96,7 +96,7 @@ public List<String> identityIds() {
     }
 
     /**
-     * Set the identityIds value.
+     * Set the list of user identities associated with the virtual machine scale set. The user identity references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
      *
      * @param identityIds the identityIds value to set
      * @return the VirtualMachineScaleSetIdentity object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetInstanceViewStatusesSummary.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetInstanceViewStatusesSummary.java
index 89a115546d2f..c41e5a3cd64f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetInstanceViewStatusesSummary.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetInstanceViewStatusesSummary.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetInstanceViewStatusesSummary {
     private List<VirtualMachineStatusCodeCount> statusesSummary;
 
     /**
-     * Get the statusesSummary value.
+     * Get the extensions information.
      *
      * @return the statusesSummary value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetManagedDiskParameters.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetManagedDiskParameters.java
index 46d2bd0badf3..dca60d3e05b6 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetManagedDiskParameters.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetManagedDiskParameters.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetManagedDiskParameters {
     private StorageAccountTypes storageAccountType;
 
     /**
-     * Get the storageAccountType value.
+     * Get specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @return the storageAccountType value
      */
@@ -32,7 +32,7 @@ public StorageAccountTypes storageAccountType() {
     }
 
     /**
-     * Set the storageAccountType value.
+     * Set specifies the storage account type for the managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS'.
      *
      * @param storageAccountType the storageAccountType value to set
      * @return the VirtualMachineScaleSetManagedDiskParameters object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfiguration.java
index da9b07362594..988099e1d668 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfiguration.java
@@ -64,7 +64,7 @@ public class VirtualMachineScaleSetNetworkConfiguration extends SubResource {
     private Boolean enableIPForwarding;
 
     /**
-     * Get the name value.
+     * Get the network configuration name.
      *
      * @return the name value
      */
@@ -73,7 +73,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the network configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -84,7 +84,7 @@ public VirtualMachineScaleSetNetworkConfiguration withName(String name) {
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @return the primary value
      */
@@ -93,7 +93,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary network interface in case the virtual machine has more than 1 network interface.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -104,7 +104,7 @@ public VirtualMachineScaleSetNetworkConfiguration withPrimary(Boolean primary) {
     }
 
     /**
-     * Get the enableAcceleratedNetworking value.
+     * Get specifies whether the network interface is accelerated networking-enabled.
      *
      * @return the enableAcceleratedNetworking value
      */
@@ -113,7 +113,7 @@ public Boolean enableAcceleratedNetworking() {
     }
 
     /**
-     * Set the enableAcceleratedNetworking value.
+     * Set specifies whether the network interface is accelerated networking-enabled.
      *
      * @param enableAcceleratedNetworking the enableAcceleratedNetworking value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -124,7 +124,7 @@ public VirtualMachineScaleSetNetworkConfiguration withEnableAcceleratedNetworkin
     }
 
     /**
-     * Get the networkSecurityGroup value.
+     * Get the network security group.
      *
      * @return the networkSecurityGroup value
      */
@@ -133,7 +133,7 @@ public SubResource networkSecurityGroup() {
     }
 
     /**
-     * Set the networkSecurityGroup value.
+     * Set the network security group.
      *
      * @param networkSecurityGroup the networkSecurityGroup value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -144,7 +144,7 @@ public VirtualMachineScaleSetNetworkConfiguration withNetworkSecurityGroup(SubRe
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the network interfaces.
      *
      * @return the dnsSettings value
      */
@@ -153,7 +153,7 @@ public VirtualMachineScaleSetNetworkConfigurationDnsSettings dnsSettings() {
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the network interfaces.
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -164,7 +164,7 @@ public VirtualMachineScaleSetNetworkConfiguration withDnsSettings(VirtualMachine
     }
 
     /**
-     * Get the ipConfigurations value.
+     * Get specifies the IP configurations of the network interface.
      *
      * @return the ipConfigurations value
      */
@@ -173,7 +173,7 @@ public List<VirtualMachineScaleSetIPConfiguration> ipConfigurations() {
     }
 
     /**
-     * Set the ipConfigurations value.
+     * Set specifies the IP configurations of the network interface.
      *
      * @param ipConfigurations the ipConfigurations value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
@@ -184,7 +184,7 @@ public VirtualMachineScaleSetNetworkConfiguration withIpConfigurations(List<Virt
     }
 
     /**
-     * Get the enableIPForwarding value.
+     * Get whether IP forwarding enabled on this NIC.
      *
      * @return the enableIPForwarding value
      */
@@ -193,7 +193,7 @@ public Boolean enableIPForwarding() {
     }
 
     /**
-     * Set the enableIPForwarding value.
+     * Set whether IP forwarding enabled on this NIC.
      *
      * @param enableIPForwarding the enableIPForwarding value to set
      * @return the VirtualMachineScaleSetNetworkConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
index 11d72e97be77..1367222d7b86 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkConfigurationDnsSettings.java
@@ -23,7 +23,7 @@ public class VirtualMachineScaleSetNetworkConfigurationDnsSettings {
     private List<String> dnsServers;
 
     /**
-     * Get the dnsServers value.
+     * Get list of DNS servers IP addresses.
      *
      * @return the dnsServers value
      */
@@ -32,7 +32,7 @@ public List<String> dnsServers() {
     }
 
     /**
-     * Set the dnsServers value.
+     * Set list of DNS servers IP addresses.
      *
      * @param dnsServers the dnsServers value to set
      * @return the VirtualMachineScaleSetNetworkConfigurationDnsSettings object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkProfile.java
index 20a4f21334b9..5846717bccc2 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetNetworkProfile.java
@@ -31,7 +31,7 @@ public class VirtualMachineScaleSetNetworkProfile {
     private List<VirtualMachineScaleSetNetworkConfiguration> networkInterfaceConfigurations;
 
     /**
-     * Get the healthProbe value.
+     * Get a reference to a load balancer probe used to determine the health of an instance in the virtual machine scale set. The reference will be in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
      *
      * @return the healthProbe value
      */
@@ -40,7 +40,7 @@ public ApiEntityReference healthProbe() {
     }
 
     /**
-     * Set the healthProbe value.
+     * Set a reference to a load balancer probe used to determine the health of an instance in the virtual machine scale set. The reference will be in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
      *
      * @param healthProbe the healthProbe value to set
      * @return the VirtualMachineScaleSetNetworkProfile object itself.
@@ -51,7 +51,7 @@ public VirtualMachineScaleSetNetworkProfile withHealthProbe(ApiEntityReference h
     }
 
     /**
-     * Get the networkInterfaceConfigurations value.
+     * Get the list of network configurations.
      *
      * @return the networkInterfaceConfigurations value
      */
@@ -60,7 +60,7 @@ public List<VirtualMachineScaleSetNetworkConfiguration> networkInterfaceConfigur
     }
 
     /**
-     * Set the networkInterfaceConfigurations value.
+     * Set the list of network configurations.
      *
      * @param networkInterfaceConfigurations the networkInterfaceConfigurations value to set
      * @return the VirtualMachineScaleSetNetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSDisk.java
index 2fa837682605..3e7faba4dc5b 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSDisk.java
@@ -81,7 +81,7 @@ public class VirtualMachineScaleSetOSDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the name value.
+     * Get the disk name.
      *
      * @return the name value
      */
@@ -90,7 +90,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the disk name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -101,7 +101,7 @@ public VirtualMachineScaleSetOSDisk withName(String name) {
     }
 
     /**
-     * Get the caching value.
+     * Get specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -110,7 +110,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set specifies the caching requirements. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **None** &lt;br&gt;&lt;br&gt; **ReadOnly** &lt;br&gt;&lt;br&gt; **ReadWrite** &lt;br&gt;&lt;br&gt; Default: **None for Standard storage. ReadOnly for Premium storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -121,7 +121,7 @@ public VirtualMachineScaleSetOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the writeAcceleratorEnabled value.
+     * Get specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @return the writeAcceleratorEnabled value
      */
@@ -130,7 +130,7 @@ public Boolean writeAcceleratorEnabled() {
     }
 
     /**
-     * Set the writeAcceleratorEnabled value.
+     * Set specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @param writeAcceleratorEnabled the writeAcceleratorEnabled value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -141,7 +141,7 @@ public VirtualMachineScaleSetOSDisk withWriteAcceleratorEnabled(Boolean writeAcc
     }
 
     /**
-     * Get the createOption value.
+     * Get specifies how the virtual machines in the scale set should be created.&lt;br&gt;&lt;br&gt; The only allowed value is: **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @return the createOption value
      */
@@ -150,7 +150,7 @@ public DiskCreateOptionTypes createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set specifies how the virtual machines in the scale set should be created.&lt;br&gt;&lt;br&gt; The only allowed value is: **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you  also use the plan element previously described. Possible values include: 'FromImage', 'Empty', 'Attach'.
      *
      * @param createOption the createOption value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -161,7 +161,7 @@ public VirtualMachineScaleSetOSDisk withCreateOption(DiskCreateOptionTypes creat
     }
 
     /**
-     * Get the osType value.
+     * Get this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -170,7 +170,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set this property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; **Windows** &lt;br&gt;&lt;br&gt; **Linux**. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -181,7 +181,7 @@ public VirtualMachineScaleSetOSDisk withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the image value.
+     * Get specifies information about the unmanaged user image to base the scale set on.
      *
      * @return the image value
      */
@@ -190,7 +190,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set specifies information about the unmanaged user image to base the scale set on.
      *
      * @param image the image value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -201,7 +201,7 @@ public VirtualMachineScaleSetOSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the vhdContainers value.
+     * Get specifies the container urls that are used to store operating system disks for the scale set.
      *
      * @return the vhdContainers value
      */
@@ -210,7 +210,7 @@ public List<String> vhdContainers() {
     }
 
     /**
-     * Set the vhdContainers value.
+     * Set specifies the container urls that are used to store operating system disks for the scale set.
      *
      * @param vhdContainers the vhdContainers value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
@@ -221,7 +221,7 @@ public VirtualMachineScaleSetOSDisk withVhdContainers(List<String> vhdContainers
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -230,7 +230,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetOSDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSProfile.java
index 2ba8f8865d1f..18636b79d422 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetOSProfile.java
@@ -102,7 +102,7 @@ public class VirtualMachineScaleSetOSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the computerNamePrefix value.
+     * Get specifies the computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
      *
      * @return the computerNamePrefix value
      */
@@ -111,7 +111,7 @@ public String computerNamePrefix() {
     }
 
     /**
-     * Set the computerNamePrefix value.
+     * Set specifies the computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
      *
      * @param computerNamePrefix the computerNamePrefix value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -122,7 +122,7 @@ public VirtualMachineScaleSetOSProfile withComputerNamePrefix(String computerNam
     }
 
     /**
-     * Get the adminUsername value.
+     * Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the adminUsername value
      */
@@ -131,7 +131,7 @@ public String adminUsername() {
     }
 
     /**
-     * Set the adminUsername value.
+     * Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **Windows-only restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 1  character &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 64 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 20 characters  &lt;br&gt;&lt;br&gt;&lt;li&gt; For root access to the Linux VM, see [Using root privileges on Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)&lt;br&gt;&lt;li&gt; For a list of built-in system users on Linux that should not be used in this field, see [Selecting User Names for Linux on Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param adminUsername the adminUsername value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -142,7 +142,7 @@ public VirtualMachineScaleSetOSProfile withAdminUsername(String adminUsername) {
     }
 
     /**
-     * Get the adminPassword value.
+     * Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @return the adminPassword value
      */
@@ -151,7 +151,7 @@ public String adminPassword() {
     }
 
     /**
-     * Set the adminPassword value.
+     * Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length (Windows):** 8 characters &lt;br&gt;&lt;br&gt; **Minimum-length (Linux):** 6 characters &lt;br&gt;&lt;br&gt; **Max-length (Windows):** 123 characters &lt;br&gt;&lt;br&gt; **Max-length (Linux):** 72 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!" &lt;br&gt;&lt;br&gt; For resetting the password, see [How to reset the Remote Desktop service or its login password in a Windows VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; For resetting root password, see [Manage users, SSH, and check or repair disks on Azure Linux VMs using the VMAccess Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password).
      *
      * @param adminPassword the adminPassword value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -162,7 +162,7 @@ public VirtualMachineScaleSetOSProfile withAdminPassword(String adminPassword) {
     }
 
     /**
-     * Get the customData value.
+     * Get specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the customData value
      */
@@ -171,7 +171,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set specifies a base-64 encoded string of custom data. The base-64 encoded string is decoded to a binary array that is saved as a file on the Virtual Machine. The maximum length of the binary array is 65535 bytes. &lt;br&gt;&lt;br&gt; For using cloud-init for your VM, see [Using cloud-init to customize a Linux VM during creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param customData the customData value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -182,7 +182,7 @@ public VirtualMachineScaleSetOSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get specifies Windows operating system settings on the virtual machine.
      *
      * @return the windowsConfiguration value
      */
@@ -191,7 +191,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set specifies Windows operating system settings on the virtual machine.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -202,7 +202,7 @@ public VirtualMachineScaleSetOSProfile withWindowsConfiguration(WindowsConfigura
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @return the linuxConfiguration value
      */
@@ -211,7 +211,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set specifies the Linux operating system settings on the virtual machine. &lt;br&gt;&lt;br&gt;For a list of supported Linux distributions, see [Linux on Azure-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json) &lt;br&gt;&lt;br&gt; For running non-endorsed distributions, see [Information for Non-Endorsed Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
@@ -222,7 +222,7 @@ public VirtualMachineScaleSetOSProfile withLinuxConfiguration(LinuxConfiguration
     }
 
     /**
-     * Get the secrets value.
+     * Get specifies set of certificates that should be installed onto the virtual machines in the scale set.
      *
      * @return the secrets value
      */
@@ -231,7 +231,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set specifies set of certificates that should be installed onto the virtual machines in the scale set.
      *
      * @param secrets the secrets value to set
      * @return the VirtualMachineScaleSetOSProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfiguration.java
index e4fe35588ea0..1b29e8281cc3 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfiguration.java
@@ -36,7 +36,7 @@ public class VirtualMachineScaleSetPublicIPAddressConfiguration {
     private VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings;
 
     /**
-     * Get the name value.
+     * Get the publicIP address configuration name.
      *
      * @return the name value
      */
@@ -45,7 +45,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the publicIP address configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
@@ -56,7 +56,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration withName(String name)
     }
 
     /**
-     * Get the idleTimeoutInMinutes value.
+     * Get the idle timeout of the public IP address.
      *
      * @return the idleTimeoutInMinutes value
      */
@@ -65,7 +65,7 @@ public Integer idleTimeoutInMinutes() {
     }
 
     /**
-     * Set the idleTimeoutInMinutes value.
+     * Set the idle timeout of the public IP address.
      *
      * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
@@ -76,7 +76,7 @@ public VirtualMachineScaleSetPublicIPAddressConfiguration withIdleTimeoutInMinut
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the publicIP addresses .
      *
      * @return the dnsSettings value
      */
@@ -85,7 +85,7 @@ public VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the publicIP addresses .
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
index f0639265059f..c44a35870b2e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings.java
@@ -24,7 +24,7 @@ public class VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings {
     private String domainNameLabel;
 
     /**
-     * Get the domainNameLabel value.
+     * Get the Domain name label.The concatenation of the domain name label and vm index will be the domain name labels of the PublicIPAddress resources that will be created.
      *
      * @return the domainNameLabel value
      */
@@ -33,7 +33,7 @@ public String domainNameLabel() {
     }
 
     /**
-     * Set the domainNameLabel value.
+     * Set the Domain name label.The concatenation of the domain name label and vm index will be the domain name labels of the PublicIPAddress resources that will be created.
      *
      * @param domainNameLabel the domainNameLabel value to set
      * @return the VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetSkuCapacity.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetSkuCapacity.java
index c7c6b826cd1a..73cbebc94db1 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetSkuCapacity.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetSkuCapacity.java
@@ -40,7 +40,7 @@ public class VirtualMachineScaleSetSkuCapacity {
     private VirtualMachineScaleSetSkuScaleType scaleType;
 
     /**
-     * Get the minimum value.
+     * Get the minimum capacity.
      *
      * @return the minimum value
      */
@@ -49,7 +49,7 @@ public Long minimum() {
     }
 
     /**
-     * Get the maximum value.
+     * Get the maximum capacity that can be set.
      *
      * @return the maximum value
      */
@@ -58,7 +58,7 @@ public Long maximum() {
     }
 
     /**
-     * Get the defaultCapacity value.
+     * Get the default capacity.
      *
      * @return the defaultCapacity value
      */
@@ -67,7 +67,7 @@ public Long defaultCapacity() {
     }
 
     /**
-     * Get the scaleType value.
+     * Get the scale type applicable to the sku. Possible values include: 'Automatic', 'None'.
      *
      * @return the scaleType value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetStorageProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetStorageProfile.java
index 19029de8ae06..83c6b538596e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetStorageProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetStorageProfile.java
@@ -44,7 +44,7 @@ public class VirtualMachineScaleSetStorageProfile {
     private List<VirtualMachineScaleSetDataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @return the imageReference value
      */
@@ -53,7 +53,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set specifies information about the image to use. You can specify information about platform images, marketplace images, or virtual machine images. This element is required when you want to use a platform image, marketplace image, or virtual machine image, but is not used in other creation operations.
      *
      * @param imageReference the imageReference value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
@@ -64,7 +64,7 @@ public VirtualMachineScaleSetStorageProfile withImageReference(ImageReference im
     }
 
     /**
-     * Get the osDisk value.
+     * Get specifies information about the operating system disk used by the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the osDisk value
      */
@@ -73,7 +73,7 @@ public VirtualMachineScaleSetOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set specifies information about the operating system disk used by the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param osDisk the osDisk value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
@@ -84,7 +84,7 @@ public VirtualMachineScaleSetStorageProfile withOsDisk(VirtualMachineScaleSetOSD
     }
 
     /**
-     * Get the dataDisks value.
+     * Get specifies the parameters that are used to add data disks to the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @return the dataDisks value
      */
@@ -93,7 +93,7 @@ public List<VirtualMachineScaleSetDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set specifies the parameters that are used to add data disks to the virtual machines in the scale set. &lt;br&gt;&lt;br&gt; For more information about disks, see [About disks and VHDs for Azure virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
      *
      * @param dataDisks the dataDisks value to set
      * @return the VirtualMachineScaleSetStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdate.java
index c2fee99f9fbe..c5b549ad809f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdate.java
@@ -62,7 +62,7 @@ public class VirtualMachineScaleSetUpdate extends UpdateResource {
     private VirtualMachineScaleSetIdentity identity;
 
     /**
-     * Get the sku value.
+     * Get the virtual machine scale set sku.
      *
      * @return the sku value
      */
@@ -71,7 +71,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the virtual machine scale set sku.
      *
      * @param sku the sku value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -82,7 +82,7 @@ public VirtualMachineScaleSetUpdate withSku(Sku sku) {
     }
 
     /**
-     * Get the plan value.
+     * Get the purchase plan when deploying a virtual machine scale set from VM Marketplace images.
      *
      * @return the plan value
      */
@@ -91,7 +91,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set the purchase plan when deploying a virtual machine scale set from VM Marketplace images.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -102,7 +102,7 @@ public VirtualMachineScaleSetUpdate withPlan(Plan plan) {
     }
 
     /**
-     * Get the upgradePolicy value.
+     * Get the upgrade policy.
      *
      * @return the upgradePolicy value
      */
@@ -111,7 +111,7 @@ public UpgradePolicy upgradePolicy() {
     }
 
     /**
-     * Set the upgradePolicy value.
+     * Set the upgrade policy.
      *
      * @param upgradePolicy the upgradePolicy value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -122,7 +122,7 @@ public VirtualMachineScaleSetUpdate withUpgradePolicy(UpgradePolicy upgradePolic
     }
 
     /**
-     * Get the virtualMachineProfile value.
+     * Get the virtual machine profile.
      *
      * @return the virtualMachineProfile value
      */
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateVMProfile virtualMachineProfile() {
     }
 
     /**
-     * Set the virtualMachineProfile value.
+     * Set the virtual machine profile.
      *
      * @param virtualMachineProfile the virtualMachineProfile value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -142,7 +142,7 @@ public VirtualMachineScaleSetUpdate withVirtualMachineProfile(VirtualMachineScal
     }
 
     /**
-     * Get the overprovision value.
+     * Get specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @return the overprovision value
      */
@@ -151,7 +151,7 @@ public Boolean overprovision() {
     }
 
     /**
-     * Set the overprovision value.
+     * Set specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @param overprovision the overprovision value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -162,7 +162,7 @@ public VirtualMachineScaleSetUpdate withOverprovision(Boolean overprovision) {
     }
 
     /**
-     * Get the singlePlacementGroup value.
+     * Get when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @return the singlePlacementGroup value
      */
@@ -171,7 +171,7 @@ public Boolean singlePlacementGroup() {
     }
 
     /**
-     * Set the singlePlacementGroup value.
+     * Set when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @param singlePlacementGroup the singlePlacementGroup value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
@@ -182,7 +182,7 @@ public VirtualMachineScaleSetUpdate withSinglePlacementGroup(Boolean singlePlace
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine scale set, if configured.
      *
      * @return the identity value
      */
@@ -191,7 +191,7 @@ public VirtualMachineScaleSetIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine scale set, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineScaleSetUpdate object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateIPConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateIPConfiguration.java
index be15c1aa49e8..338714c1be22 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateIPConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateIPConfiguration.java
@@ -71,7 +71,7 @@ public class VirtualMachineScaleSetUpdateIPConfiguration extends SubResource {
     private List<SubResource> loadBalancerInboundNatPools;
 
     /**
-     * Get the name value.
+     * Get the IP configuration name.
      *
      * @return the name value
      */
@@ -80,7 +80,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the IP configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -91,7 +91,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withName(String name) {
     }
 
     /**
-     * Get the subnet value.
+     * Get the subnet.
      *
      * @return the subnet value
      */
@@ -100,7 +100,7 @@ public ApiEntityReference subnet() {
     }
 
     /**
-     * Set the subnet value.
+     * Set the subnet.
      *
      * @param subnet the subnet value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -111,7 +111,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withSubnet(ApiEntityReference
     }
 
     /**
-     * Get the primary value.
+     * Get specifies the primary IP Configuration in case the network interface has more than one IP Configuration.
      *
      * @return the primary value
      */
@@ -120,7 +120,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set specifies the primary IP Configuration in case the network interface has more than one IP Configuration.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPrimary(Boolean primary)
     }
 
     /**
-     * Get the publicIPAddressConfiguration value.
+     * Get the publicIPAddressConfiguration.
      *
      * @return the publicIPAddressConfiguration value
      */
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration publicIPAddressC
     }
 
     /**
-     * Set the publicIPAddressConfiguration value.
+     * Set the publicIPAddressConfiguration.
      *
      * @param publicIPAddressConfiguration the publicIPAddressConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -151,7 +151,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPublicIPAddressConfigurat
     }
 
     /**
-     * Get the privateIPAddressVersion value.
+     * Get available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @return the privateIPAddressVersion value
      */
@@ -160,7 +160,7 @@ public IPVersion privateIPAddressVersion() {
     }
 
     /**
-     * Set the privateIPAddressVersion value.
+     * Set available from Api-Version 2017-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'.
      *
      * @param privateIPAddressVersion the privateIPAddressVersion value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -171,7 +171,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withPrivateIPAddressVersion(I
     }
 
     /**
-     * Get the applicationGatewayBackendAddressPools value.
+     * Get the application gateway backend address pools.
      *
      * @return the applicationGatewayBackendAddressPools value
      */
@@ -180,7 +180,7 @@ public List<SubResource> applicationGatewayBackendAddressPools() {
     }
 
     /**
-     * Set the applicationGatewayBackendAddressPools value.
+     * Set the application gateway backend address pools.
      *
      * @param applicationGatewayBackendAddressPools the applicationGatewayBackendAddressPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -191,7 +191,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withApplicationGatewayBackend
     }
 
     /**
-     * Get the loadBalancerBackendAddressPools value.
+     * Get the load balancer backend address pools.
      *
      * @return the loadBalancerBackendAddressPools value
      */
@@ -200,7 +200,7 @@ public List<SubResource> loadBalancerBackendAddressPools() {
     }
 
     /**
-     * Set the loadBalancerBackendAddressPools value.
+     * Set the load balancer backend address pools.
      *
      * @param loadBalancerBackendAddressPools the loadBalancerBackendAddressPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
@@ -211,7 +211,7 @@ public VirtualMachineScaleSetUpdateIPConfiguration withLoadBalancerBackendAddres
     }
 
     /**
-     * Get the loadBalancerInboundNatPools value.
+     * Get the load balancer inbound nat pools.
      *
      * @return the loadBalancerInboundNatPools value
      */
@@ -220,7 +220,7 @@ public List<SubResource> loadBalancerInboundNatPools() {
     }
 
     /**
-     * Set the loadBalancerInboundNatPools value.
+     * Set the load balancer inbound nat pools.
      *
      * @param loadBalancerInboundNatPools the loadBalancerInboundNatPools value to set
      * @return the VirtualMachineScaleSetUpdateIPConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkConfiguration.java
index 65cf928769b8..164e5ff3a3b9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkConfiguration.java
@@ -63,7 +63,7 @@ public class VirtualMachineScaleSetUpdateNetworkConfiguration extends SubResourc
     private Boolean enableIPForwarding;
 
     /**
-     * Get the name value.
+     * Get the network configuration name.
      *
      * @return the name value
      */
@@ -72,7 +72,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the network configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -83,7 +83,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withName(String name) {
     }
 
     /**
-     * Get the primary value.
+     * Get whether this is a primary NIC on a virtual machine.
      *
      * @return the primary value
      */
@@ -92,7 +92,7 @@ public Boolean primary() {
     }
 
     /**
-     * Set the primary value.
+     * Set whether this is a primary NIC on a virtual machine.
      *
      * @param primary the primary value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -103,7 +103,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withPrimary(Boolean prim
     }
 
     /**
-     * Get the enableAcceleratedNetworking value.
+     * Get specifies whether the network interface is accelerated networking-enabled.
      *
      * @return the enableAcceleratedNetworking value
      */
@@ -112,7 +112,7 @@ public Boolean enableAcceleratedNetworking() {
     }
 
     /**
-     * Set the enableAcceleratedNetworking value.
+     * Set specifies whether the network interface is accelerated networking-enabled.
      *
      * @param enableAcceleratedNetworking the enableAcceleratedNetworking value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -123,7 +123,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withEnableAcceleratedNet
     }
 
     /**
-     * Get the networkSecurityGroup value.
+     * Get the network security group.
      *
      * @return the networkSecurityGroup value
      */
@@ -132,7 +132,7 @@ public SubResource networkSecurityGroup() {
     }
 
     /**
-     * Set the networkSecurityGroup value.
+     * Set the network security group.
      *
      * @param networkSecurityGroup the networkSecurityGroup value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -143,7 +143,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withNetworkSecurityGroup
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the network interfaces.
      *
      * @return the dnsSettings value
      */
@@ -152,7 +152,7 @@ public VirtualMachineScaleSetNetworkConfigurationDnsSettings dnsSettings() {
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the network interfaces.
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -163,7 +163,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withDnsSettings(VirtualM
     }
 
     /**
-     * Get the ipConfigurations value.
+     * Get the virtual machine scale set IP Configuration.
      *
      * @return the ipConfigurations value
      */
@@ -172,7 +172,7 @@ public List<VirtualMachineScaleSetUpdateIPConfiguration> ipConfigurations() {
     }
 
     /**
-     * Set the ipConfigurations value.
+     * Set the virtual machine scale set IP Configuration.
      *
      * @param ipConfigurations the ipConfigurations value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
@@ -183,7 +183,7 @@ public VirtualMachineScaleSetUpdateNetworkConfiguration withIpConfigurations(Lis
     }
 
     /**
-     * Get the enableIPForwarding value.
+     * Get whether IP forwarding enabled on this NIC.
      *
      * @return the enableIPForwarding value
      */
@@ -192,7 +192,7 @@ public Boolean enableIPForwarding() {
     }
 
     /**
-     * Set the enableIPForwarding value.
+     * Set whether IP forwarding enabled on this NIC.
      *
      * @param enableIPForwarding the enableIPForwarding value to set
      * @return the VirtualMachineScaleSetUpdateNetworkConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkProfile.java
index cc84e6a723df..baa850b4f875 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateNetworkProfile.java
@@ -22,7 +22,7 @@ public class VirtualMachineScaleSetUpdateNetworkProfile {
     private List<VirtualMachineScaleSetUpdateNetworkConfiguration> networkInterfaceConfigurations;
 
     /**
-     * Get the networkInterfaceConfigurations value.
+     * Get the list of network configurations.
      *
      * @return the networkInterfaceConfigurations value
      */
@@ -31,7 +31,7 @@ public List<VirtualMachineScaleSetUpdateNetworkConfiguration> networkInterfaceCo
     }
 
     /**
-     * Set the networkInterfaceConfigurations value.
+     * Set the list of network configurations.
      *
      * @param networkInterfaceConfigurations the networkInterfaceConfigurations value to set
      * @return the VirtualMachineScaleSetUpdateNetworkProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSDisk.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSDisk.java
index bed53718e5ec..74acab75698e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSDisk.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSDisk.java
@@ -51,7 +51,7 @@ public class VirtualMachineScaleSetUpdateOSDisk {
     private VirtualMachineScaleSetManagedDiskParameters managedDisk;
 
     /**
-     * Get the caching value.
+     * Get the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @return the caching value
      */
@@ -60,7 +60,7 @@ public CachingTypes caching() {
     }
 
     /**
-     * Set the caching value.
+     * Set the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'.
      *
      * @param caching the caching value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -71,7 +71,7 @@ public VirtualMachineScaleSetUpdateOSDisk withCaching(CachingTypes caching) {
     }
 
     /**
-     * Get the writeAcceleratorEnabled value.
+     * Get specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @return the writeAcceleratorEnabled value
      */
@@ -80,7 +80,7 @@ public Boolean writeAcceleratorEnabled() {
     }
 
     /**
-     * Set the writeAcceleratorEnabled value.
+     * Set specifies whether writeAccelerator should be enabled or disabled on the disk.
      *
      * @param writeAcceleratorEnabled the writeAcceleratorEnabled value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -91,7 +91,7 @@ public VirtualMachineScaleSetUpdateOSDisk withWriteAcceleratorEnabled(Boolean wr
     }
 
     /**
-     * Get the image value.
+     * Get the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine. If SourceImage is provided, the destination VirtualHardDisk should not exist.
      *
      * @return the image value
      */
@@ -100,7 +100,7 @@ public VirtualHardDisk image() {
     }
 
     /**
-     * Set the image value.
+     * Set the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine. If SourceImage is provided, the destination VirtualHardDisk should not exist.
      *
      * @param image the image value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -111,7 +111,7 @@ public VirtualMachineScaleSetUpdateOSDisk withImage(VirtualHardDisk image) {
     }
 
     /**
-     * Get the vhdContainers value.
+     * Get the list of virtual hard disk container uris.
      *
      * @return the vhdContainers value
      */
@@ -120,7 +120,7 @@ public List<String> vhdContainers() {
     }
 
     /**
-     * Set the vhdContainers value.
+     * Set the list of virtual hard disk container uris.
      *
      * @param vhdContainers the vhdContainers value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateOSDisk withVhdContainers(List<String> vhdCont
     }
 
     /**
-     * Get the managedDisk value.
+     * Get the managed disk parameters.
      *
      * @return the managedDisk value
      */
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetManagedDiskParameters managedDisk() {
     }
 
     /**
-     * Set the managedDisk value.
+     * Set the managed disk parameters.
      *
      * @param managedDisk the managedDisk value to set
      * @return the VirtualMachineScaleSetUpdateOSDisk object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSProfile.java
index 11839825f71a..49374b9ce975 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateOSProfile.java
@@ -40,7 +40,7 @@ public class VirtualMachineScaleSetUpdateOSProfile {
     private List<VaultSecretGroup> secrets;
 
     /**
-     * Get the customData value.
+     * Get a base-64 encoded string of custom data.
      *
      * @return the customData value
      */
@@ -49,7 +49,7 @@ public String customData() {
     }
 
     /**
-     * Set the customData value.
+     * Set a base-64 encoded string of custom data.
      *
      * @param customData the customData value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -60,7 +60,7 @@ public VirtualMachineScaleSetUpdateOSProfile withCustomData(String customData) {
     }
 
     /**
-     * Get the windowsConfiguration value.
+     * Get the Windows Configuration of the OS profile.
      *
      * @return the windowsConfiguration value
      */
@@ -69,7 +69,7 @@ public WindowsConfiguration windowsConfiguration() {
     }
 
     /**
-     * Set the windowsConfiguration value.
+     * Set the Windows Configuration of the OS profile.
      *
      * @param windowsConfiguration the windowsConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -80,7 +80,7 @@ public VirtualMachineScaleSetUpdateOSProfile withWindowsConfiguration(WindowsCon
     }
 
     /**
-     * Get the linuxConfiguration value.
+     * Get the Linux Configuration of the OS profile.
      *
      * @return the linuxConfiguration value
      */
@@ -89,7 +89,7 @@ public LinuxConfiguration linuxConfiguration() {
     }
 
     /**
-     * Set the linuxConfiguration value.
+     * Set the Linux Configuration of the OS profile.
      *
      * @param linuxConfiguration the linuxConfiguration value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetUpdateOSProfile withLinuxConfiguration(LinuxConfigu
     }
 
     /**
-     * Get the secrets value.
+     * Get the List of certificates for addition to the VM.
      *
      * @return the secrets value
      */
@@ -109,7 +109,7 @@ public List<VaultSecretGroup> secrets() {
     }
 
     /**
-     * Set the secrets value.
+     * Set the List of certificates for addition to the VM.
      *
      * @param secrets the secrets value to set
      * @return the VirtualMachineScaleSetUpdateOSProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
index b5b410999086..bd011b083f93 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdatePublicIPAddressConfiguration.java
@@ -36,7 +36,7 @@ public class VirtualMachineScaleSetUpdatePublicIPAddressConfiguration {
     private VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings;
 
     /**
-     * Get the name value.
+     * Get the publicIP address configuration name.
      *
      * @return the name value
      */
@@ -45,7 +45,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the publicIP address configuration name.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
@@ -56,7 +56,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration withName(String
     }
 
     /**
-     * Get the idleTimeoutInMinutes value.
+     * Get the idle timeout of the public IP address.
      *
      * @return the idleTimeoutInMinutes value
      */
@@ -65,7 +65,7 @@ public Integer idleTimeoutInMinutes() {
     }
 
     /**
-     * Set the idleTimeoutInMinutes value.
+     * Set the idle timeout of the public IP address.
      *
      * @param idleTimeoutInMinutes the idleTimeoutInMinutes value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
@@ -76,7 +76,7 @@ public VirtualMachineScaleSetUpdatePublicIPAddressConfiguration withIdleTimeoutI
     }
 
     /**
-     * Get the dnsSettings value.
+     * Get the dns settings to be applied on the publicIP addresses .
      *
      * @return the dnsSettings value
      */
@@ -85,7 +85,7 @@ public VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings dnsSettings
     }
 
     /**
-     * Set the dnsSettings value.
+     * Set the dns settings to be applied on the publicIP addresses .
      *
      * @param dnsSettings the dnsSettings value to set
      * @return the VirtualMachineScaleSetUpdatePublicIPAddressConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateStorageProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateStorageProfile.java
index c631fca0fbce..9ca0f7b2f2b2 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateStorageProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateStorageProfile.java
@@ -34,7 +34,7 @@ public class VirtualMachineScaleSetUpdateStorageProfile {
     private List<VirtualMachineScaleSetDataDisk> dataDisks;
 
     /**
-     * Get the imageReference value.
+     * Get the image reference.
      *
      * @return the imageReference value
      */
@@ -43,7 +43,7 @@ public ImageReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set the image reference.
      *
      * @param imageReference the imageReference value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
@@ -54,7 +54,7 @@ public VirtualMachineScaleSetUpdateStorageProfile withImageReference(ImageRefere
     }
 
     /**
-     * Get the osDisk value.
+     * Get the OS disk.
      *
      * @return the osDisk value
      */
@@ -63,7 +63,7 @@ public VirtualMachineScaleSetUpdateOSDisk osDisk() {
     }
 
     /**
-     * Set the osDisk value.
+     * Set the OS disk.
      *
      * @param osDisk the osDisk value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
@@ -74,7 +74,7 @@ public VirtualMachineScaleSetUpdateStorageProfile withOsDisk(VirtualMachineScale
     }
 
     /**
-     * Get the dataDisks value.
+     * Get the data disks.
      *
      * @return the dataDisks value
      */
@@ -83,7 +83,7 @@ public List<VirtualMachineScaleSetDataDisk> dataDisks() {
     }
 
     /**
-     * Set the dataDisks value.
+     * Set the data disks.
      *
      * @param dataDisks the dataDisks value to set
      * @return the VirtualMachineScaleSetUpdateStorageProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateVMProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateVMProfile.java
index 0e4083a5c1f0..2eee2eee5abe 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateVMProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetUpdateVMProfile.java
@@ -51,7 +51,7 @@ public class VirtualMachineScaleSetUpdateVMProfile {
     private String licenseType;
 
     /**
-     * Get the osProfile value.
+     * Get the virtual machine scale set OS profile.
      *
      * @return the osProfile value
      */
@@ -60,7 +60,7 @@ public VirtualMachineScaleSetUpdateOSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set the virtual machine scale set OS profile.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -71,7 +71,7 @@ public VirtualMachineScaleSetUpdateVMProfile withOsProfile(VirtualMachineScaleSe
     }
 
     /**
-     * Get the storageProfile value.
+     * Get the virtual machine scale set storage profile.
      *
      * @return the storageProfile value
      */
@@ -80,7 +80,7 @@ public VirtualMachineScaleSetUpdateStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set the virtual machine scale set storage profile.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -91,7 +91,7 @@ public VirtualMachineScaleSetUpdateVMProfile withStorageProfile(VirtualMachineSc
     }
 
     /**
-     * Get the networkProfile value.
+     * Get the virtual machine scale set network profile.
      *
      * @return the networkProfile value
      */
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetUpdateNetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set the virtual machine scale set network profile.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -111,7 +111,7 @@ public VirtualMachineScaleSetUpdateVMProfile withNetworkProfile(VirtualMachineSc
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get the virtual machine scale set diagnostics profile.
      *
      * @return the diagnosticsProfile value
      */
@@ -120,7 +120,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set the virtual machine scale set diagnostics profile.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -131,7 +131,7 @@ public VirtualMachineScaleSetUpdateVMProfile withDiagnosticsProfile(DiagnosticsP
     }
 
     /**
-     * Get the extensionProfile value.
+     * Get the virtual machine scale set extension profile.
      *
      * @return the extensionProfile value
      */
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetExtensionProfile extensionProfile() {
     }
 
     /**
-     * Set the extensionProfile value.
+     * Set the virtual machine scale set extension profile.
      *
      * @param extensionProfile the extensionProfile value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
@@ -151,7 +151,7 @@ public VirtualMachineScaleSetUpdateVMProfile withExtensionProfile(VirtualMachine
     }
 
     /**
-     * Get the licenseType value.
+     * Get the license type, which is for bring your own license scenario.
      *
      * @return the licenseType value
      */
@@ -160,7 +160,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set the license type, which is for bring your own license scenario.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetUpdateVMProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
index 54fae114dfa8..6782fb01d8c4 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVM.java
@@ -52,7 +52,7 @@ public interface VirtualMachineScaleSetVM extends HasInner<VirtualMachineScaleSe
     /**
      * @return the instanceView value.
      */
-    VirtualMachineInstanceView instanceView();
+    VirtualMachineScaleSetVMInstanceView instanceView();
 
     /**
      * @return the latestModelApplied value.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMExtensionsSummary.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMExtensionsSummary.java
index 3cc0b1117e51..726e86547d25 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMExtensionsSummary.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMExtensionsSummary.java
@@ -28,7 +28,7 @@ public class VirtualMachineScaleSetVMExtensionsSummary {
     private List<VirtualMachineStatusCodeCount> statusesSummary;
 
     /**
-     * Get the name value.
+     * Get the extension name.
      *
      * @return the name value
      */
@@ -37,7 +37,7 @@ public String name() {
     }
 
     /**
-     * Get the statusesSummary value.
+     * Get the extensions information.
      *
      * @return the statusesSummary value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceIDs.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceIDs.java
index ea1977fc1ae0..6c2b2d9c19e3 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceIDs.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceIDs.java
@@ -24,7 +24,7 @@ public class VirtualMachineScaleSetVMInstanceIDs {
     private List<String> instanceIds;
 
     /**
-     * Get the instanceIds value.
+     * Get the virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set.
      *
      * @return the instanceIds value
      */
@@ -33,7 +33,7 @@ public List<String> instanceIds() {
     }
 
     /**
-     * Set the instanceIds value.
+     * Set the virtual machine scale set instance ids. Omitting the virtual machine scale set instance ids will result in the operation being performed on all virtual machines in the virtual machine scale set.
      *
      * @param instanceIds the instanceIds value to set
      * @return the VirtualMachineScaleSetVMInstanceIDs object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceRequiredIDs.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceRequiredIDs.java
index 21a2329dcbac..a80417dda49c 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceRequiredIDs.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMInstanceRequiredIDs.java
@@ -22,7 +22,7 @@ public class VirtualMachineScaleSetVMInstanceRequiredIDs {
     private List<String> instanceIds;
 
     /**
-     * Get the instanceIds value.
+     * Get the virtual machine scale set instance ids.
      *
      * @return the instanceIds value
      */
@@ -31,7 +31,7 @@ public List<String> instanceIds() {
     }
 
     /**
-     * Set the instanceIds value.
+     * Set the virtual machine scale set instance ids.
      *
      * @param instanceIds the instanceIds value to set
      * @return the VirtualMachineScaleSetVMInstanceRequiredIDs object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMProfile.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMProfile.java
index 875ae1de688b..821e6e66e0b7 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMProfile.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSetVMProfile.java
@@ -80,7 +80,7 @@ public class VirtualMachineScaleSetVMProfile {
     private VirtualMachineEvictionPolicyTypes evictionPolicy;
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machines in the scale set.
      *
      * @return the osProfile value
      */
@@ -89,7 +89,7 @@ public VirtualMachineScaleSetOSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machines in the scale set.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -100,7 +100,7 @@ public VirtualMachineScaleSetVMProfile withOsProfile(VirtualMachineScaleSetOSPro
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -109,7 +109,7 @@ public VirtualMachineScaleSetStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -120,7 +120,7 @@ public VirtualMachineScaleSetVMProfile withStorageProfile(VirtualMachineScaleSet
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies properties of the network interfaces of the virtual machines in the scale set.
      *
      * @return the networkProfile value
      */
@@ -129,7 +129,7 @@ public VirtualMachineScaleSetNetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies properties of the network interfaces of the virtual machines in the scale set.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -140,7 +140,7 @@ public VirtualMachineScaleSetVMProfile withNetworkProfile(VirtualMachineScaleSet
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -149,7 +149,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -160,7 +160,7 @@ public VirtualMachineScaleSetVMProfile withDiagnosticsProfile(DiagnosticsProfile
     }
 
     /**
-     * Get the extensionProfile value.
+     * Get specifies a collection of settings for extensions installed on virtual machines in the scale set.
      *
      * @return the extensionProfile value
      */
@@ -169,7 +169,7 @@ public VirtualMachineScaleSetExtensionProfile extensionProfile() {
     }
 
     /**
-     * Set the extensionProfile value.
+     * Set specifies a collection of settings for extensions installed on virtual machines in the scale set.
      *
      * @param extensionProfile the extensionProfile value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -180,7 +180,7 @@ public VirtualMachineScaleSetVMProfile withExtensionProfile(VirtualMachineScaleS
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -189,7 +189,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -200,7 +200,7 @@ public VirtualMachineScaleSetVMProfile withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the priority value.
+     * Get specifies the priority for the virtual machines in the scale set. &lt;br&gt;&lt;br&gt;Minimum api-version: 2017-10-30-preview. Possible values include: 'Regular', 'Low'.
      *
      * @return the priority value
      */
@@ -209,7 +209,7 @@ public VirtualMachinePriorityTypes priority() {
     }
 
     /**
-     * Set the priority value.
+     * Set specifies the priority for the virtual machines in the scale set. &lt;br&gt;&lt;br&gt;Minimum api-version: 2017-10-30-preview. Possible values include: 'Regular', 'Low'.
      *
      * @param priority the priority value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
@@ -220,7 +220,7 @@ public VirtualMachineScaleSetVMProfile withPriority(VirtualMachinePriorityTypes
     }
 
     /**
-     * Get the evictionPolicy value.
+     * Get specifies the eviction policy for virtual machines in a low priority scale set. &lt;br&gt;&lt;br&gt;Minimum api-version: 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'.
      *
      * @return the evictionPolicy value
      */
@@ -229,7 +229,7 @@ public VirtualMachineEvictionPolicyTypes evictionPolicy() {
     }
 
     /**
-     * Set the evictionPolicy value.
+     * Set specifies the eviction policy for virtual machines in a low priority scale set. &lt;br&gt;&lt;br&gt;Minimum api-version: 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'.
      *
      * @param evictionPolicy the evictionPolicy value to set
      * @return the VirtualMachineScaleSetVMProfile object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSets.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSets.java
index 678ae9efeef9..d160337ede05 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSets.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineScaleSets.java
@@ -106,7 +106,7 @@ public interface VirtualMachineScaleSets extends SupportsCreating<VirtualMachine
     Observable<OperationStatusResponse> redeployAsync(String resourceGroupName, String vmScaleSetName);
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineStatusCodeCount.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineStatusCodeCount.java
index 018f8c719e76..9ea79047103c 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineStatusCodeCount.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineStatusCodeCount.java
@@ -28,7 +28,7 @@ public class VirtualMachineStatusCodeCount {
     private Integer count;
 
     /**
-     * Get the code value.
+     * Get the instance view status code.
      *
      * @return the code value
      */
@@ -37,7 +37,7 @@ public String code() {
     }
 
     /**
-     * Get the count value.
+     * Get the number of instances having a particular status code.
      *
      * @return the count value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
index e1ccbb507cd9..23c42f82fdf9 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineUpdate.java
@@ -127,7 +127,7 @@ public class VirtualMachineUpdate extends UpdateResource {
     private List<String> zones;
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -136,7 +136,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineUpdate object itself.
@@ -147,7 +147,7 @@ public VirtualMachineUpdate withPlan(Plan plan) {
     }
 
     /**
-     * Get the hardwareProfile value.
+     * Get specifies the hardware settings for the virtual machine.
      *
      * @return the hardwareProfile value
      */
@@ -156,7 +156,7 @@ public HardwareProfile hardwareProfile() {
     }
 
     /**
-     * Set the hardwareProfile value.
+     * Set specifies the hardware settings for the virtual machine.
      *
      * @param hardwareProfile the hardwareProfile value to set
      * @return the VirtualMachineUpdate object itself.
@@ -167,7 +167,7 @@ public VirtualMachineUpdate withHardwareProfile(HardwareProfile hardwareProfile)
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -176,7 +176,7 @@ public StorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineUpdate object itself.
@@ -187,7 +187,7 @@ public VirtualMachineUpdate withStorageProfile(StorageProfile storageProfile) {
     }
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machine.
      *
      * @return the osProfile value
      */
@@ -196,7 +196,7 @@ public OSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machine.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineUpdate object itself.
@@ -207,7 +207,7 @@ public VirtualMachineUpdate withOsProfile(OSProfile osProfile) {
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies the network interfaces of the virtual machine.
      *
      * @return the networkProfile value
      */
@@ -216,7 +216,7 @@ public NetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies the network interfaces of the virtual machine.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineUpdate object itself.
@@ -227,7 +227,7 @@ public VirtualMachineUpdate withNetworkProfile(NetworkProfile networkProfile) {
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -236,7 +236,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineUpdate object itself.
@@ -247,7 +247,7 @@ public VirtualMachineUpdate withDiagnosticsProfile(DiagnosticsProfile diagnostic
     }
 
     /**
-     * Get the availabilitySet value.
+     * Get specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @return the availabilitySet value
      */
@@ -256,7 +256,7 @@ public SubResource availabilitySet() {
     }
 
     /**
-     * Set the availabilitySet value.
+     * Set specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @param availabilitySet the availabilitySet value to set
      * @return the VirtualMachineUpdate object itself.
@@ -267,7 +267,7 @@ public VirtualMachineUpdate withAvailabilitySet(SubResource availabilitySet) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -276,7 +276,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine instance view.
      *
      * @return the instanceView value
      */
@@ -285,7 +285,7 @@ public VirtualMachineInstanceViewInner instanceView() {
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -294,7 +294,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineUpdate object itself.
@@ -305,7 +305,7 @@ public VirtualMachineUpdate withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the vmId value.
+     * Get specifies the VM unique ID which is a 128-bits identifier that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read using platform BIOS commands.
      *
      * @return the vmId value
      */
@@ -314,7 +314,7 @@ public String vmId() {
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine, if configured.
      *
      * @return the identity value
      */
@@ -323,7 +323,7 @@ public VirtualMachineIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineUpdate object itself.
@@ -334,7 +334,7 @@ public VirtualMachineUpdate withIdentity(VirtualMachineIdentity identity) {
     }
 
     /**
-     * Get the zones value.
+     * Get the virtual machine zones.
      *
      * @return the zones value
      */
@@ -343,7 +343,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the virtual machine zones.
      *
      * @param zones the zones value to set
      * @return the VirtualMachineUpdate object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMConfiguration.java
index 30bdcfe1e06e..da00d7ac9051 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMConfiguration.java
@@ -22,7 +22,7 @@ public class WinRMConfiguration {
     private List<WinRMListener> listeners;
 
     /**
-     * Get the listeners value.
+     * Get the list of Windows Remote Management listeners.
      *
      * @return the listeners value
      */
@@ -31,7 +31,7 @@ public List<WinRMListener> listeners() {
     }
 
     /**
-     * Set the listeners value.
+     * Set the list of Windows Remote Management listeners.
      *
      * @param listeners the listeners value to set
      * @return the WinRMConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMListener.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMListener.java
index 66941981f508..0cf0c4c7fafa 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMListener.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WinRMListener.java
@@ -38,7 +38,7 @@ public class WinRMListener {
     private String certificateUrl;
 
     /**
-     * Get the protocol value.
+     * Get specifies the protocol of listener. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;**http** &lt;br&gt;&lt;br&gt; **https**. Possible values include: 'Http', 'Https'.
      *
      * @return the protocol value
      */
@@ -47,7 +47,7 @@ public ProtocolTypes protocol() {
     }
 
     /**
-     * Set the protocol value.
+     * Set specifies the protocol of listener. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;**http** &lt;br&gt;&lt;br&gt; **https**. Possible values include: 'Http', 'Https'.
      *
      * @param protocol the protocol value to set
      * @return the WinRMListener object itself.
@@ -58,7 +58,7 @@ public WinRMListener withProtocol(ProtocolTypes protocol) {
     }
 
     /**
-     * Get the certificateUrl value.
+     * Get this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @return the certificateUrl value
      */
@@ -67,7 +67,7 @@ public String certificateUrl() {
     }
 
     /**
-     * Set the certificateUrl value.
+     * Set this is the URL of a certificate that has been uploaded to Key Vault as a secret. For adding a secret to the Key Vault, see [Add a key or secret to the key vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add). In this case, your certificate needs to be It is the Base64 encoding of the following JSON Object which is encoded in UTF-8: &lt;br&gt;&lt;br&gt; {&lt;br&gt;  "data":"&lt;Base64-encoded-certificate&gt;",&lt;br&gt;  "dataType":"pfx",&lt;br&gt;  "password":"&lt;pfx-file-password&gt;"&lt;br&gt;}.
      *
      * @param certificateUrl the certificateUrl value to set
      * @return the WinRMListener object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WindowsConfiguration.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WindowsConfiguration.java
index a4276da6d0b6..74eb118f148e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WindowsConfiguration.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/WindowsConfiguration.java
@@ -53,7 +53,7 @@ public class WindowsConfiguration {
     private WinRMConfiguration winRM;
 
     /**
-     * Get the provisionVMAgent value.
+     * Get indicates whether virtual machine agent should be provisioned on the virtual machine. &lt;br&gt;&lt;br&gt; When this property is not specified in the request body, default behavior is to set it to true.  This will ensure that VM Agent is installed on the VM so that extensions can be added to the VM later.
      *
      * @return the provisionVMAgent value
      */
@@ -62,7 +62,7 @@ public Boolean provisionVMAgent() {
     }
 
     /**
-     * Set the provisionVMAgent value.
+     * Set indicates whether virtual machine agent should be provisioned on the virtual machine. &lt;br&gt;&lt;br&gt; When this property is not specified in the request body, default behavior is to set it to true.  This will ensure that VM Agent is installed on the VM so that extensions can be added to the VM later.
      *
      * @param provisionVMAgent the provisionVMAgent value to set
      * @return the WindowsConfiguration object itself.
@@ -73,7 +73,7 @@ public WindowsConfiguration withProvisionVMAgent(Boolean provisionVMAgent) {
     }
 
     /**
-     * Get the enableAutomaticUpdates value.
+     * Get indicates whether virtual machine is enabled for automatic updates.
      *
      * @return the enableAutomaticUpdates value
      */
@@ -82,7 +82,7 @@ public Boolean enableAutomaticUpdates() {
     }
 
     /**
-     * Set the enableAutomaticUpdates value.
+     * Set indicates whether virtual machine is enabled for automatic updates.
      *
      * @param enableAutomaticUpdates the enableAutomaticUpdates value to set
      * @return the WindowsConfiguration object itself.
@@ -93,7 +93,7 @@ public WindowsConfiguration withEnableAutomaticUpdates(Boolean enableAutomaticUp
     }
 
     /**
-     * Get the timeZone value.
+     * Get specifies the time zone of the virtual machine. e.g. "Pacific Standard Time".
      *
      * @return the timeZone value
      */
@@ -102,7 +102,7 @@ public String timeZone() {
     }
 
     /**
-     * Set the timeZone value.
+     * Set specifies the time zone of the virtual machine. e.g. "Pacific Standard Time".
      *
      * @param timeZone the timeZone value to set
      * @return the WindowsConfiguration object itself.
@@ -113,7 +113,7 @@ public WindowsConfiguration withTimeZone(String timeZone) {
     }
 
     /**
-     * Get the additionalUnattendContent value.
+     * Get specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup.
      *
      * @return the additionalUnattendContent value
      */
@@ -122,7 +122,7 @@ public List<AdditionalUnattendContent> additionalUnattendContent() {
     }
 
     /**
-     * Set the additionalUnattendContent value.
+     * Set specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup.
      *
      * @param additionalUnattendContent the additionalUnattendContent value to set
      * @return the WindowsConfiguration object itself.
@@ -133,7 +133,7 @@ public WindowsConfiguration withAdditionalUnattendContent(List<AdditionalUnatten
     }
 
     /**
-     * Get the winRM value.
+     * Get specifies the Windows Remote Management listeners. This enables remote Windows PowerShell.
      *
      * @return the winRM value
      */
@@ -142,7 +142,7 @@ public WinRMConfiguration winRM() {
     }
 
     /**
-     * Set the winRM value.
+     * Set specifies the Windows Remote Management listeners. This enables remote Windows PowerShell.
      *
      * @param winRM the winRM value to set
      * @return the WindowsConfiguration object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetInner.java
index f702763348a1..238e5f5ef772 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetInner.java
@@ -61,7 +61,7 @@ public class AvailabilitySetInner extends Resource {
     private Sku sku;
 
     /**
-     * Get the platformUpdateDomainCount value.
+     * Get update Domain count.
      *
      * @return the platformUpdateDomainCount value
      */
@@ -70,7 +70,7 @@ public Integer platformUpdateDomainCount() {
     }
 
     /**
-     * Set the platformUpdateDomainCount value.
+     * Set update Domain count.
      *
      * @param platformUpdateDomainCount the platformUpdateDomainCount value to set
      * @return the AvailabilitySetInner object itself.
@@ -81,7 +81,7 @@ public AvailabilitySetInner withPlatformUpdateDomainCount(Integer platformUpdate
     }
 
     /**
-     * Get the platformFaultDomainCount value.
+     * Get fault Domain count.
      *
      * @return the platformFaultDomainCount value
      */
@@ -90,7 +90,7 @@ public Integer platformFaultDomainCount() {
     }
 
     /**
-     * Set the platformFaultDomainCount value.
+     * Set fault Domain count.
      *
      * @param platformFaultDomainCount the platformFaultDomainCount value to set
      * @return the AvailabilitySetInner object itself.
@@ -101,7 +101,7 @@ public AvailabilitySetInner withPlatformFaultDomainCount(Integer platformFaultDo
     }
 
     /**
-     * Get the virtualMachines value.
+     * Get a list of references to all virtual machines in the availability set.
      *
      * @return the virtualMachines value
      */
@@ -110,7 +110,7 @@ public List<SubResource> virtualMachines() {
     }
 
     /**
-     * Set the virtualMachines value.
+     * Set a list of references to all virtual machines in the availability set.
      *
      * @param virtualMachines the virtualMachines value to set
      * @return the AvailabilitySetInner object itself.
@@ -121,7 +121,7 @@ public AvailabilitySetInner withVirtualMachines(List<SubResource> virtualMachine
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -130,7 +130,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Get the sku value.
+     * Get sku of the availability set.
      *
      * @return the sku value
      */
@@ -139,7 +139,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set sku of the availability set.
      *
      * @param sku the sku value to set
      * @return the AvailabilitySetInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsImpl.java
index 6ce355a24014..2a6b514d323c 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsImpl.java
@@ -84,10 +84,34 @@ public PagedList<AvailabilitySet> listByResourceGroup(String resourceGroupName)
     public Observable<AvailabilitySet> listByResourceGroupAsync(String resourceGroupName) {
         AvailabilitySetsInner client = this.inner();
         return client.listByResourceGroupAsync(resourceGroupName)
-        .flatMap(new Func1<Page<AvailabilitySetInner>, Observable<AvailabilitySetInner>>() {
+        .flatMapIterable(new Func1<Page<AvailabilitySetInner>, Iterable<AvailabilitySetInner>>() {
             @Override
-            public Observable<AvailabilitySetInner> call(Page<AvailabilitySetInner> innerPage) {
-                return Observable.from(innerPage.items());
+            public Iterable<AvailabilitySetInner> call(Page<AvailabilitySetInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<AvailabilitySetInner, AvailabilitySet>() {
+            @Override
+            public AvailabilitySet call(AvailabilitySetInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<AvailabilitySet> list() {
+        AvailabilitySetsInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<AvailabilitySet> listAsync() {
+        AvailabilitySetsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<AvailabilitySetInner>, Iterable<AvailabilitySetInner>>() {
+            @Override
+            public Iterable<AvailabilitySetInner> call(Page<AvailabilitySetInner> page) {
+                return page.items();
             }
         })
         .map(new Func1<AvailabilitySetInner, AvailabilitySet>() {
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsInner.java
index fa14ad6ae1b6..b8d28f9534ac 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/AvailabilitySetsInner.java
@@ -10,9 +10,12 @@
 
 import com.microsoft.azure.arm.collection.InnerSupportsGet;
 import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
 import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
 import com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySetUpdate;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.PagedList;
@@ -32,6 +35,7 @@
 import retrofit2.http.Path;
 import retrofit2.http.PUT;
 import retrofit2.http.Query;
+import retrofit2.http.Url;
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
@@ -40,7 +44,7 @@
  * An instance of this class provides access to all the operations defined
  * in AvailabilitySets.
  */
-public class AvailabilitySetsInner implements InnerSupportsGet<AvailabilitySetInner>, InnerSupportsDelete<OperationStatusResponseInner> {
+public class AvailabilitySetsInner implements InnerSupportsGet<AvailabilitySetInner>, InnerSupportsDelete<OperationStatusResponseInner>, InnerSupportsListing<AvailabilitySetInner> {
     /** The Retrofit service to perform REST calls. */
     private AvailabilitySetsService service;
     /** The service client containing this operation class. */
@@ -78,6 +82,10 @@ interface AvailabilitySetsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}")
         Observable<Response<ResponseBody>> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("availabilitySetName") String availabilitySetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySets list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySets listByResourceGroup" })
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets")
         Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -86,6 +94,14 @@ interface AvailabilitySetsService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes")
         Observable<Response<ResponseBody>> listAvailableSizes(@Path("resourceGroupName") String resourceGroupName, @Path("availabilitySetName") String availabilitySetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySets listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.compute.v2017_12_01.AvailabilitySets listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -449,20 +465,128 @@ private ServiceResponse<AvailabilitySetInner> getByResourceGroupDelegate(Respons
                 .build(response);
     }
 
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> list() {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @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<List<AvailabilitySetInner>> listAsync(final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<AvailabilitySetInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<AvailabilitySetInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<AvailabilitySetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the PagedList<AvailabilitySetInner> object if successful.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
      */
-    public PagedList<AvailabilitySetInner> listByResourceGroup(String resourceGroupName) {
-        PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-        page.setItems(listByResourceGroupWithServiceResponseAsync(resourceGroupName).toBlocking().single().body());
-        page.setNextPageLink(null);
-        return new PagedList<AvailabilitySetInner>(page) {
+    public PagedList<AvailabilitySetInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
             @Override
             public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
-                return null;
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
         };
     }
@@ -472,36 +596,67 @@ public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
      *
      * @param resourceGroupName The name of the resource group.
      * @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<List<AvailabilitySetInner>> listByResourceGroupAsync(String resourceGroupName, final ServiceCallback<List<AvailabilitySetInner>> serviceCallback) {
-        return ServiceFuture.fromResponse(listByResourceGroupWithServiceResponseAsync(resourceGroupName), serviceCallback);
+    public ServiceFuture<List<AvailabilitySetInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the observable to the List&lt;AvailabilitySetInner&gt; object
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
      */
-    public Observable<Page<AvailabilitySetInner>> listByResourceGroupAsync(String resourceGroupName) {
-        return listByResourceGroupWithServiceResponseAsync(resourceGroupName).map(new Func1<ServiceResponse<List<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
-            @Override
-            public Page<AvailabilitySetInner> call(ServiceResponse<List<AvailabilitySetInner>> response) {
-                PageImpl<AvailabilitySetInner> page = new PageImpl<>();
-                page.setItems(response.body());
-                return page;
-            }
-        });
+    public Observable<Page<AvailabilitySetInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
      * Lists all availability sets in a resource group.
      *
      * @param resourceGroupName The name of the resource group.
-     * @return the observable to the List&lt;AvailabilitySetInner&gt; object
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
      */
-    public Observable<ServiceResponse<List<AvailabilitySetInner>>> listByResourceGroupWithServiceResponseAsync(String resourceGroupName) {
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+    ServiceResponse<PageImpl1<AvailabilitySetInner>> * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
         if (resourceGroupName == null) {
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
@@ -512,17 +667,12 @@ public Observable<ServiceResponse<List<AvailabilitySetInner>>> listByResourceGro
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<List<AvailabilitySetInner>>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<List<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PageImpl<AvailabilitySetInner>> result = listByResourceGroupDelegate(response);
-                        List<AvailabilitySetInner> items = null;
-                        if (result.body() != null) {
-                            items = result.body().items();
-                        }
-                        ServiceResponse<List<AvailabilitySetInner>> clientResponse = new ServiceResponse<List<AvailabilitySetInner>>(items, result.response());
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<AvailabilitySetInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -530,9 +680,9 @@ public Observable<ServiceResponse<List<AvailabilitySetInner>>> call(Response<Res
             });
     }
 
-    private ServiceResponse<PageImpl<AvailabilitySetInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PageImpl<AvailabilitySetInner>>() { }.getType())
+    private ServiceResponse<PageImpl1<AvailabilitySetInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<AvailabilitySetInner>>() { }.getType())
                 .registerError(CloudException.class)
                 .build(response);
     }
@@ -628,4 +778,226 @@ private ServiceResponse<PageImpl<VirtualMachineSizeInner>> listAvailableSizesDel
                 .build(response);
     }
 
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<AvailabilitySetInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<AvailabilitySetInner>> serviceFuture, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a subscription.
+     *
+    ServiceResponse<PageImpl1<AvailabilitySetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<AvailabilitySetInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<AvailabilitySetInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<AvailabilitySetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;AvailabilitySetInner&gt; object if successful.
+     */
+    public PagedList<AvailabilitySetInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<AvailabilitySetInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<AvailabilitySetInner>(response.body()) {
+            @Override
+            public Page<AvailabilitySetInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<AvailabilitySetInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<AvailabilitySetInner>> serviceFuture, final ListOperationCallback<AvailabilitySetInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<Page<AvailabilitySetInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Page<AvailabilitySetInner>>() {
+                @Override
+                public Page<AvailabilitySetInner> call(ServiceResponse<Page<AvailabilitySetInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;AvailabilitySetInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<AvailabilitySetInner>>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(ServiceResponse<Page<AvailabilitySetInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all availability sets in a resource group.
+     *
+    ServiceResponse<PageImpl1<AvailabilitySetInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;AvailabilitySetInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<AvailabilitySetInner>>> listByResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<AvailabilitySetInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<AvailabilitySetInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<AvailabilitySetInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<AvailabilitySetInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<AvailabilitySetInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<AvailabilitySetInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<AvailabilitySetInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
 }
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ComputeOperationValueInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ComputeOperationValueInner.java
index e82311886fd3..c41754b4b0ac 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ComputeOperationValueInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ComputeOperationValueInner.java
@@ -53,7 +53,7 @@ public class ComputeOperationValueInner {
     private String provider;
 
     /**
-     * Get the origin value.
+     * Get the origin of the compute operation.
      *
      * @return the origin value
      */
@@ -62,7 +62,7 @@ public String origin() {
     }
 
     /**
-     * Get the name value.
+     * Get the name of the compute operation.
      *
      * @return the name value
      */
@@ -71,7 +71,7 @@ public String name() {
     }
 
     /**
-     * Get the operation value.
+     * Get the display name of the compute operation.
      *
      * @return the operation value
      */
@@ -80,7 +80,7 @@ public String operation() {
     }
 
     /**
-     * Get the resource value.
+     * Get the display name of the resource the operation applies to.
      *
      * @return the resource value
      */
@@ -89,7 +89,7 @@ public String resource() {
     }
 
     /**
-     * Get the description value.
+     * Get the description of the operation.
      *
      * @return the description value
      */
@@ -98,7 +98,7 @@ public String description() {
     }
 
     /**
-     * Get the provider value.
+     * Get the resource provider for the operation.
      *
      * @return the provider value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ImageInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ImageInner.java
index 8677533dc069..e1f7806ff729 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ImageInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/ImageInner.java
@@ -40,7 +40,7 @@ public class ImageInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the sourceVirtualMachine value.
+     * Get the source virtual machine from which Image is created.
      *
      * @return the sourceVirtualMachine value
      */
@@ -49,7 +49,7 @@ public SubResource sourceVirtualMachine() {
     }
 
     /**
-     * Set the sourceVirtualMachine value.
+     * Set the source virtual machine from which Image is created.
      *
      * @param sourceVirtualMachine the sourceVirtualMachine value to set
      * @return the ImageInner object itself.
@@ -60,7 +60,7 @@ public ImageInner withSourceVirtualMachine(SubResource sourceVirtualMachine) {
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -69,7 +69,7 @@ public ImageStorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the ImageInner object itself.
@@ -80,7 +80,7 @@ public ImageInner withStorageProfile(ImageStorageProfile storageProfile) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/LogAnalyticsOperationResultInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/LogAnalyticsOperationResultInner.java
index 86e31eb7330c..afca07fcf051 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/LogAnalyticsOperationResultInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/LogAnalyticsOperationResultInner.java
@@ -22,7 +22,7 @@ public class LogAnalyticsOperationResultInner extends OperationStatusResponseInn
     private LogAnalyticsOutput properties;
 
     /**
-     * Get the properties value.
+     * Get logAnalyticsOutput.
      *
      * @return the properties value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationStatusResponseInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationStatusResponseInner.java
index 66f3b7784f70..ef1d5db2a087 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationStatusResponseInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationStatusResponseInner.java
@@ -47,7 +47,7 @@ public class OperationStatusResponseInner {
     private ApiError error;
 
     /**
-     * Get the name value.
+     * Get operation ID.
      *
      * @return the name value
      */
@@ -56,7 +56,7 @@ public String name() {
     }
 
     /**
-     * Get the status value.
+     * Get operation status.
      *
      * @return the status value
      */
@@ -65,7 +65,7 @@ public String status() {
     }
 
     /**
-     * Get the startTime value.
+     * Get start time of the operation.
      *
      * @return the startTime value
      */
@@ -74,7 +74,7 @@ public DateTime startTime() {
     }
 
     /**
-     * Get the endTime value.
+     * Get end time of the operation.
      *
      * @return the endTime value
      */
@@ -83,7 +83,7 @@ public DateTime endTime() {
     }
 
     /**
-     * Get the error value.
+     * Get api error.
      *
      * @return the error value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationsImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationsImpl.java
index abee543a7818..fc45996cbeec 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationsImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/OperationsImpl.java
@@ -37,7 +37,8 @@ public Observable<ComputeOperationValue> listAsync() {
             public Observable<ComputeOperationValueInner> call(List<ComputeOperationValueInner> innerList) {
                 return Observable.from(innerList);
             }
-        })    .map(new Func1<ComputeOperationValueInner, ComputeOperationValue>() {
+        })
+        .map(new Func1<ComputeOperationValueInner, ComputeOperationValue>() {
             @Override
             public ComputeOperationValue call(ComputeOperationValueInner inner) {
                 return new ComputeOperationValueImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RecoveryWalkResponseInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RecoveryWalkResponseInner.java
index c77b8cec2975..c58bd81dfb02 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RecoveryWalkResponseInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RecoveryWalkResponseInner.java
@@ -28,7 +28,7 @@ public class RecoveryWalkResponseInner {
     private Integer nextPlatformUpdateDomain;
 
     /**
-     * Get the walkPerformed value.
+     * Get whether the recovery walk was performed.
      *
      * @return the walkPerformed value
      */
@@ -37,7 +37,7 @@ public Boolean walkPerformed() {
     }
 
     /**
-     * Get the nextPlatformUpdateDomain value.
+     * Get the next update domain that needs to be walked. Null means walk spanning all update domains has been completed.
      *
      * @return the nextPlatformUpdateDomain value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RollingUpgradeStatusInfoInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RollingUpgradeStatusInfoInner.java
index 0af22fd1bbf4..3e41bafe67f3 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RollingUpgradeStatusInfoInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RollingUpgradeStatusInfoInner.java
@@ -47,7 +47,7 @@ public class RollingUpgradeStatusInfoInner extends Resource {
     private ApiError error;
 
     /**
-     * Get the policy value.
+     * Get the rolling upgrade policies applied for this upgrade.
      *
      * @return the policy value
      */
@@ -56,7 +56,7 @@ public RollingUpgradePolicy policy() {
     }
 
     /**
-     * Get the runningStatus value.
+     * Get information about the current running state of the overall upgrade.
      *
      * @return the runningStatus value
      */
@@ -65,7 +65,7 @@ public RollingUpgradeRunningStatus runningStatus() {
     }
 
     /**
-     * Get the progress value.
+     * Get information about the number of virtual machine instances in each upgrade state.
      *
      * @return the progress value
      */
@@ -74,7 +74,7 @@ public RollingUpgradeProgressInfo progress() {
     }
 
     /**
-     * Get the error value.
+     * Get error details for this upgrade, if there are any.
      *
      * @return the error value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentBaseInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentBaseInner.java
index 11ee1a247b1e..2123b1fcaade 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentBaseInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentBaseInner.java
@@ -46,7 +46,7 @@ public class RunCommandDocumentBaseInner {
     private String description;
 
     /**
-     * Get the schema value.
+     * Get the VM run command schema.
      *
      * @return the schema value
      */
@@ -55,7 +55,7 @@ public String schema() {
     }
 
     /**
-     * Set the schema value.
+     * Set the VM run command schema.
      *
      * @param schema the schema value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -66,7 +66,7 @@ public RunCommandDocumentBaseInner withSchema(String schema) {
     }
 
     /**
-     * Get the id value.
+     * Get the VM run command id.
      *
      * @return the id value
      */
@@ -75,7 +75,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the VM run command id.
      *
      * @param id the id value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -86,7 +86,7 @@ public RunCommandDocumentBaseInner withId(String id) {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -95,7 +95,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -106,7 +106,7 @@ public RunCommandDocumentBaseInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the label value.
+     * Get the VM run command label.
      *
      * @return the label value
      */
@@ -115,7 +115,7 @@ public String label() {
     }
 
     /**
-     * Set the label value.
+     * Set the VM run command label.
      *
      * @param label the label value to set
      * @return the RunCommandDocumentBaseInner object itself.
@@ -126,7 +126,7 @@ public RunCommandDocumentBaseInner withLabel(String label) {
     }
 
     /**
-     * Get the description value.
+     * Get the VM run command description.
      *
      * @return the description value
      */
@@ -135,7 +135,7 @@ public String description() {
     }
 
     /**
-     * Set the description value.
+     * Set the VM run command description.
      *
      * @param description the description value to set
      * @return the RunCommandDocumentBaseInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentInner.java
index ba8b20178115..e54ad7176894 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandDocumentInner.java
@@ -29,7 +29,7 @@ public class RunCommandDocumentInner extends RunCommandDocumentBaseInner {
     private List<RunCommandParameterDefinition> parameters;
 
     /**
-     * Get the script value.
+     * Get the script to be executed.
      *
      * @return the script value
      */
@@ -38,7 +38,7 @@ public List<String> script() {
     }
 
     /**
-     * Set the script value.
+     * Set the script to be executed.
      *
      * @param script the script value to set
      * @return the RunCommandDocumentInner object itself.
@@ -49,7 +49,7 @@ public RunCommandDocumentInner withScript(List<String> script) {
     }
 
     /**
-     * Get the parameters value.
+     * Get the parameters used by the script.
      *
      * @return the parameters value
      */
@@ -58,7 +58,7 @@ public List<RunCommandParameterDefinition> parameters() {
     }
 
     /**
-     * Set the parameters value.
+     * Set the parameters used by the script.
      *
      * @param parameters the parameters value to set
      * @return the RunCommandDocumentInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandResultInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandResultInner.java
index cec1487a8d06..ee7ce16a0929 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandResultInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/RunCommandResultInner.java
@@ -23,7 +23,7 @@ public class RunCommandResultInner extends OperationStatusResponseInner {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -32,7 +32,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the RunCommandResultInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UpgradeOperationHistoricalStatusInfoInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UpgradeOperationHistoricalStatusInfoInner.java
index 4a918adffc9f..07cce45a581b 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UpgradeOperationHistoricalStatusInfoInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UpgradeOperationHistoricalStatusInfoInner.java
@@ -34,7 +34,7 @@ public class UpgradeOperationHistoricalStatusInfoInner {
     private String location;
 
     /**
-     * Get the properties value.
+     * Get information about the properties of the upgrade operation.
      *
      * @return the properties value
      */
@@ -43,7 +43,7 @@ public UpgradeOperationHistoricalStatusInfoProperties properties() {
     }
 
     /**
-     * Get the type value.
+     * Get resource type.
      *
      * @return the type value
      */
@@ -52,7 +52,7 @@ public String type() {
     }
 
     /**
-     * Get the location value.
+     * Get resource location.
      *
      * @return the location value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UsageInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UsageInner.java
index 842f01bf0fea..294d2ffaef27 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UsageInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/UsageInner.java
@@ -41,13 +41,16 @@ public class UsageInner {
 
     /**
      * Creates an instance of UsageInner class.
+     * @param currentValue the current usage of the resource.
+     * @param limit the maximum permitted usage of the resource.
+     * @param name the name of the type of usage.
      */
     public UsageInner() {
         unit = "Count";
     }
 
     /**
-     * Get the unit value.
+     * Get an enum describing the unit of usage measurement.
      *
      * @return the unit value
      */
@@ -56,7 +59,7 @@ public String unit() {
     }
 
     /**
-     * Set the unit value.
+     * Set an enum describing the unit of usage measurement.
      *
      * @param unit the unit value to set
      * @return the UsageInner object itself.
@@ -67,7 +70,7 @@ public UsageInner withUnit(String unit) {
     }
 
     /**
-     * Get the currentValue value.
+     * Get the current usage of the resource.
      *
      * @return the currentValue value
      */
@@ -76,7 +79,7 @@ public int currentValue() {
     }
 
     /**
-     * Set the currentValue value.
+     * Set the current usage of the resource.
      *
      * @param currentValue the currentValue value to set
      * @return the UsageInner object itself.
@@ -87,7 +90,7 @@ public UsageInner withCurrentValue(int currentValue) {
     }
 
     /**
-     * Get the limit value.
+     * Get the maximum permitted usage of the resource.
      *
      * @return the limit value
      */
@@ -96,7 +99,7 @@ public long limit() {
     }
 
     /**
-     * Set the limit value.
+     * Set the maximum permitted usage of the resource.
      *
      * @param limit the limit value to set
      * @return the UsageInner object itself.
@@ -107,7 +110,7 @@ public UsageInner withLimit(long limit) {
     }
 
     /**
-     * Get the name value.
+     * Get the name of the type of usage.
      *
      * @return the name value
      */
@@ -116,7 +119,7 @@ public UsageName name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the type of usage.
      *
      * @param name the name value to set
      * @return the UsageInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineCaptureResultInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineCaptureResultInner.java
index 80219944631c..7e63454abbd1 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineCaptureResultInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineCaptureResultInner.java
@@ -24,7 +24,7 @@ public class VirtualMachineCaptureResultInner extends SubResource {
     private Object output;
 
     /**
-     * Get the output value.
+     * Get operation output data (raw JSON).
      *
      * @return the output value
      */
@@ -33,7 +33,7 @@ public Object output() {
     }
 
     /**
-     * Set the output value.
+     * Set operation output data (raw JSON).
      *
      * @param output the output value to set
      * @return the VirtualMachineCaptureResultInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImageInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImageInner.java
index cf3d684fc058..5a0b62e1348e 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImageInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImageInner.java
@@ -52,7 +52,7 @@ public class VirtualMachineExtensionImageInner extends Resource {
     private Boolean supportsMultipleExtensions;
 
     /**
-     * Get the operatingSystem value.
+     * Get the operating system this extension supports.
      *
      * @return the operatingSystem value
      */
@@ -61,7 +61,7 @@ public String operatingSystem() {
     }
 
     /**
-     * Set the operatingSystem value.
+     * Set the operating system this extension supports.
      *
      * @param operatingSystem the operatingSystem value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -72,7 +72,7 @@ public VirtualMachineExtensionImageInner withOperatingSystem(String operatingSys
     }
 
     /**
-     * Get the computeRole value.
+     * Get the type of role (IaaS or PaaS) this extension supports.
      *
      * @return the computeRole value
      */
@@ -81,7 +81,7 @@ public String computeRole() {
     }
 
     /**
-     * Set the computeRole value.
+     * Set the type of role (IaaS or PaaS) this extension supports.
      *
      * @param computeRole the computeRole value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -92,7 +92,7 @@ public VirtualMachineExtensionImageInner withComputeRole(String computeRole) {
     }
 
     /**
-     * Get the handlerSchema value.
+     * Get the schema defined by publisher, where extension consumers should provide settings in a matching schema.
      *
      * @return the handlerSchema value
      */
@@ -101,7 +101,7 @@ public String handlerSchema() {
     }
 
     /**
-     * Set the handlerSchema value.
+     * Set the schema defined by publisher, where extension consumers should provide settings in a matching schema.
      *
      * @param handlerSchema the handlerSchema value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -112,7 +112,7 @@ public VirtualMachineExtensionImageInner withHandlerSchema(String handlerSchema)
     }
 
     /**
-     * Get the vmScaleSetEnabled value.
+     * Get whether the extension can be used on xRP VMScaleSets. By default existing extensions are usable on scalesets, but there might be cases where a publisher wants to explicitly indicate the extension is only enabled for CRP VMs but not VMSS.
      *
      * @return the vmScaleSetEnabled value
      */
@@ -121,7 +121,7 @@ public Boolean vmScaleSetEnabled() {
     }
 
     /**
-     * Set the vmScaleSetEnabled value.
+     * Set whether the extension can be used on xRP VMScaleSets. By default existing extensions are usable on scalesets, but there might be cases where a publisher wants to explicitly indicate the extension is only enabled for CRP VMs but not VMSS.
      *
      * @param vmScaleSetEnabled the vmScaleSetEnabled value to set
      * @return the VirtualMachineExtensionImageInner object itself.
@@ -132,7 +132,7 @@ public VirtualMachineExtensionImageInner withVmScaleSetEnabled(Boolean vmScaleSe
     }
 
     /**
-     * Get the supportsMultipleExtensions value.
+     * Get whether the handler can support multiple extensions.
      *
      * @return the supportsMultipleExtensions value
      */
@@ -141,7 +141,7 @@ public Boolean supportsMultipleExtensions() {
     }
 
     /**
-     * Set the supportsMultipleExtensions value.
+     * Set whether the handler can support multiple extensions.
      *
      * @param supportsMultipleExtensions the supportsMultipleExtensions value to set
      * @return the VirtualMachineExtensionImageInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImagesImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImagesImpl.java
index 58df049ee1b8..e7ec388e0792 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImagesImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionImagesImpl.java
@@ -80,7 +80,8 @@ public Observable<VirtualMachineExtensionImage> listTypesAsync(String location,
             public Observable<VirtualMachineExtensionImageInner> call(List<VirtualMachineExtensionImageInner> innerList) {
                 return Observable.from(innerList);
             }
-        })    .map(new Func1<VirtualMachineExtensionImageInner, VirtualMachineExtensionImage>() {
+        })
+        .map(new Func1<VirtualMachineExtensionImageInner, VirtualMachineExtensionImage>() {
             @Override
             public VirtualMachineExtensionImage call(VirtualMachineExtensionImageInner inner) {
                 return new VirtualMachineExtensionImageImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionInner.java
index e3a7e7f13e38..fb00b50e8c67 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionInner.java
@@ -79,7 +79,7 @@ public class VirtualMachineExtensionInner extends Resource {
     private VirtualMachineExtensionInstanceView instanceView;
 
     /**
-     * Get the forceUpdateTag value.
+     * Get how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -88,7 +88,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set how the extension handler should be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -99,7 +99,7 @@ public VirtualMachineExtensionInner withForceUpdateTag(String forceUpdateTag) {
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -108,7 +108,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -119,7 +119,7 @@ public VirtualMachineExtensionInner withPublisher(String publisher) {
     }
 
     /**
-     * Get the virtualMachineExtensionType value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the virtualMachineExtensionType value
      */
@@ -128,7 +128,7 @@ public String virtualMachineExtensionType() {
     }
 
     /**
-     * Set the virtualMachineExtensionType value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param virtualMachineExtensionType the virtualMachineExtensionType value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -139,7 +139,7 @@ public VirtualMachineExtensionInner withVirtualMachineExtensionType(String virtu
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -148,7 +148,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -159,7 +159,7 @@ public VirtualMachineExtensionInner withTypeHandlerVersion(String typeHandlerVer
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -168,7 +168,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -179,7 +179,7 @@ public VirtualMachineExtensionInner withAutoUpgradeMinorVersion(Boolean autoUpgr
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -188,7 +188,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -199,7 +199,7 @@ public VirtualMachineExtensionInner withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -208,7 +208,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineExtensionInner object itself.
@@ -219,7 +219,7 @@ public VirtualMachineExtensionInner withProtectedSettings(Object protectedSettin
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -228,7 +228,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine extension instance view.
      *
      * @return the instanceView value
      */
@@ -237,7 +237,7 @@ public VirtualMachineExtensionInstanceView instanceView() {
     }
 
     /**
-     * Set the instanceView value.
+     * Set the virtual machine extension instance view.
      *
      * @param instanceView the instanceView value to set
      * @return the VirtualMachineExtensionInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsListResultInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsListResultInner.java
index d253ec1fb1bf..6bdfbf7e4e3f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsListResultInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsListResultInner.java
@@ -22,7 +22,7 @@ public class VirtualMachineExtensionsListResultInner {
     private List<VirtualMachineExtensionInner> value;
 
     /**
-     * Get the value value.
+     * Get the list of extensions.
      *
      * @return the value value
      */
@@ -31,7 +31,7 @@ public List<VirtualMachineExtensionInner> value() {
     }
 
     /**
-     * Set the value value.
+     * Set the list of extensions.
      *
      * @param value the value value to set
      * @return the VirtualMachineExtensionsListResultInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImageResourceInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImageResourceInner.java
index f5965ef35a69..f6e31814cf2d 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImageResourceInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImageResourceInner.java
@@ -37,7 +37,7 @@ public class VirtualMachineImageResourceInner extends SubResource {
     private Map<String, String> tags;
 
     /**
-     * Get the name value.
+     * Get the name of the resource.
      *
      * @return the name value
      */
@@ -46,7 +46,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the resource.
      *
      * @param name the name value to set
      * @return the VirtualMachineImageResourceInner object itself.
@@ -57,7 +57,7 @@ public VirtualMachineImageResourceInner withName(String name) {
     }
 
     /**
-     * Get the location value.
+     * Get the supported Azure location of the resource.
      *
      * @return the location value
      */
@@ -66,7 +66,7 @@ public String location() {
     }
 
     /**
-     * Set the location value.
+     * Set the supported Azure location of the resource.
      *
      * @param location the location value to set
      * @return the VirtualMachineImageResourceInner object itself.
@@ -77,7 +77,7 @@ public VirtualMachineImageResourceInner withLocation(String location) {
     }
 
     /**
-     * Get the tags value.
+     * Get specifies the tags that are assigned to the virtual machine. For more information about using tags, see [Using tags to organize your Azure resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
      *
      * @return the tags value
      */
@@ -86,7 +86,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set specifies the tags that are assigned to the virtual machine. For more information about using tags, see [Using tags to organize your Azure resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
      *
      * @param tags the tags value to set
      * @return the VirtualMachineImageResourceInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImagesImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImagesImpl.java
index 2ed07babff36..7a43b0b28223 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImagesImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImagesImpl.java
@@ -110,7 +110,8 @@ public Observable<VirtualMachineImageResource> listOffersAsync(String location,
             public Observable<VirtualMachineImageResourceInner> call(List<VirtualMachineImageResourceInner> innerList) {
                 return Observable.from(innerList);
             }
-        })    .map(new Func1<VirtualMachineImageResourceInner, VirtualMachineImageResource>() {
+        })
+        .map(new Func1<VirtualMachineImageResourceInner, VirtualMachineImageResource>() {
             @Override
             public VirtualMachineImageResource call(VirtualMachineImageResourceInner inner) {
                 return new VirtualMachineImageResourceImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
index ab7e4d2768d9..a6f556a714e1 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInner.java
@@ -140,7 +140,7 @@ public class VirtualMachineInner extends Resource {
     private List<String> zones;
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -149,7 +149,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineInner object itself.
@@ -160,7 +160,7 @@ public VirtualMachineInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the hardwareProfile value.
+     * Get specifies the hardware settings for the virtual machine.
      *
      * @return the hardwareProfile value
      */
@@ -169,7 +169,7 @@ public HardwareProfile hardwareProfile() {
     }
 
     /**
-     * Set the hardwareProfile value.
+     * Set specifies the hardware settings for the virtual machine.
      *
      * @param hardwareProfile the hardwareProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -180,7 +180,7 @@ public VirtualMachineInner withHardwareProfile(HardwareProfile hardwareProfile)
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -189,7 +189,7 @@ public StorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -200,7 +200,7 @@ public VirtualMachineInner withStorageProfile(StorageProfile storageProfile) {
     }
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machine.
      *
      * @return the osProfile value
      */
@@ -209,7 +209,7 @@ public OSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machine.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -220,7 +220,7 @@ public VirtualMachineInner withOsProfile(OSProfile osProfile) {
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies the network interfaces of the virtual machine.
      *
      * @return the networkProfile value
      */
@@ -229,7 +229,7 @@ public NetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies the network interfaces of the virtual machine.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -240,7 +240,7 @@ public VirtualMachineInner withNetworkProfile(NetworkProfile networkProfile) {
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -249,7 +249,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineInner object itself.
@@ -260,7 +260,7 @@ public VirtualMachineInner withDiagnosticsProfile(DiagnosticsProfile diagnostics
     }
 
     /**
-     * Get the availabilitySet value.
+     * Get specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @return the availabilitySet value
      */
@@ -269,7 +269,7 @@ public SubResource availabilitySet() {
     }
 
     /**
-     * Set the availabilitySet value.
+     * Set specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @param availabilitySet the availabilitySet value to set
      * @return the VirtualMachineInner object itself.
@@ -280,7 +280,7 @@ public VirtualMachineInner withAvailabilitySet(SubResource availabilitySet) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -289,7 +289,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine instance view.
      *
      * @return the instanceView value
      */
@@ -298,7 +298,7 @@ public VirtualMachineInstanceViewInner instanceView() {
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -307,7 +307,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineInner object itself.
@@ -318,7 +318,7 @@ public VirtualMachineInner withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the vmId value.
+     * Get specifies the VM unique ID which is a 128-bits identifier that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read using platform BIOS commands.
      *
      * @return the vmId value
      */
@@ -327,7 +327,7 @@ public String vmId() {
     }
 
     /**
-     * Get the resources value.
+     * Get the virtual machine child extension resources.
      *
      * @return the resources value
      */
@@ -336,7 +336,7 @@ public List<VirtualMachineExtensionInner> resources() {
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine, if configured.
      *
      * @return the identity value
      */
@@ -345,7 +345,7 @@ public VirtualMachineIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineInner object itself.
@@ -356,7 +356,7 @@ public VirtualMachineInner withIdentity(VirtualMachineIdentity identity) {
     }
 
     /**
-     * Get the zones value.
+     * Get the virtual machine zones.
      *
      * @return the zones value
      */
@@ -365,7 +365,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the virtual machine zones.
      *
      * @param zones the zones value to set
      * @return the VirtualMachineInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInstanceViewInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInstanceViewInner.java
index 491e8b04bbb0..02b18940d335 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInstanceViewInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineInstanceViewInner.java
@@ -99,7 +99,7 @@ public class VirtualMachineInstanceViewInner {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the platformUpdateDomain value.
+     * Get specifies the update domain of the virtual machine.
      *
      * @return the platformUpdateDomain value
      */
@@ -108,7 +108,7 @@ public Integer platformUpdateDomain() {
     }
 
     /**
-     * Set the platformUpdateDomain value.
+     * Set specifies the update domain of the virtual machine.
      *
      * @param platformUpdateDomain the platformUpdateDomain value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -119,7 +119,7 @@ public VirtualMachineInstanceViewInner withPlatformUpdateDomain(Integer platform
     }
 
     /**
-     * Get the platformFaultDomain value.
+     * Get specifies the fault domain of the virtual machine.
      *
      * @return the platformFaultDomain value
      */
@@ -128,7 +128,7 @@ public Integer platformFaultDomain() {
     }
 
     /**
-     * Set the platformFaultDomain value.
+     * Set specifies the fault domain of the virtual machine.
      *
      * @param platformFaultDomain the platformFaultDomain value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -139,7 +139,7 @@ public VirtualMachineInstanceViewInner withPlatformFaultDomain(Integer platformF
     }
 
     /**
-     * Get the computerName value.
+     * Get the computer name assigned to the virtual machine.
      *
      * @return the computerName value
      */
@@ -148,7 +148,7 @@ public String computerName() {
     }
 
     /**
-     * Set the computerName value.
+     * Set the computer name assigned to the virtual machine.
      *
      * @param computerName the computerName value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -159,7 +159,7 @@ public VirtualMachineInstanceViewInner withComputerName(String computerName) {
     }
 
     /**
-     * Get the osName value.
+     * Get the Operating System running on the virtual machine.
      *
      * @return the osName value
      */
@@ -168,7 +168,7 @@ public String osName() {
     }
 
     /**
-     * Set the osName value.
+     * Set the Operating System running on the virtual machine.
      *
      * @param osName the osName value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -179,7 +179,7 @@ public VirtualMachineInstanceViewInner withOsName(String osName) {
     }
 
     /**
-     * Get the osVersion value.
+     * Get the version of Operating System running on the virtual machine.
      *
      * @return the osVersion value
      */
@@ -188,7 +188,7 @@ public String osVersion() {
     }
 
     /**
-     * Set the osVersion value.
+     * Set the version of Operating System running on the virtual machine.
      *
      * @param osVersion the osVersion value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -199,7 +199,7 @@ public VirtualMachineInstanceViewInner withOsVersion(String osVersion) {
     }
 
     /**
-     * Get the rdpThumbPrint value.
+     * Get the Remote desktop certificate thumbprint.
      *
      * @return the rdpThumbPrint value
      */
@@ -208,7 +208,7 @@ public String rdpThumbPrint() {
     }
 
     /**
-     * Set the rdpThumbPrint value.
+     * Set the Remote desktop certificate thumbprint.
      *
      * @param rdpThumbPrint the rdpThumbPrint value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -219,7 +219,7 @@ public VirtualMachineInstanceViewInner withRdpThumbPrint(String rdpThumbPrint) {
     }
 
     /**
-     * Get the vmAgent value.
+     * Get the VM Agent running on the virtual machine.
      *
      * @return the vmAgent value
      */
@@ -228,7 +228,7 @@ public VirtualMachineAgentInstanceView vmAgent() {
     }
 
     /**
-     * Set the vmAgent value.
+     * Set the VM Agent running on the virtual machine.
      *
      * @param vmAgent the vmAgent value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -239,7 +239,7 @@ public VirtualMachineInstanceViewInner withVmAgent(VirtualMachineAgentInstanceVi
     }
 
     /**
-     * Get the maintenanceRedeployStatus value.
+     * Get the Maintenance Operation status on the virtual machine.
      *
      * @return the maintenanceRedeployStatus value
      */
@@ -248,7 +248,7 @@ public MaintenanceRedeployStatus maintenanceRedeployStatus() {
     }
 
     /**
-     * Set the maintenanceRedeployStatus value.
+     * Set the Maintenance Operation status on the virtual machine.
      *
      * @param maintenanceRedeployStatus the maintenanceRedeployStatus value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -259,7 +259,7 @@ public VirtualMachineInstanceViewInner withMaintenanceRedeployStatus(Maintenance
     }
 
     /**
-     * Get the disks value.
+     * Get the virtual machine disk information.
      *
      * @return the disks value
      */
@@ -268,7 +268,7 @@ public List<DiskInstanceView> disks() {
     }
 
     /**
-     * Set the disks value.
+     * Set the virtual machine disk information.
      *
      * @param disks the disks value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -279,7 +279,7 @@ public VirtualMachineInstanceViewInner withDisks(List<DiskInstanceView> disks) {
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -288,7 +288,7 @@ public List<VirtualMachineExtensionInstanceView> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the extensions information.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -299,7 +299,7 @@ public VirtualMachineInstanceViewInner withExtensions(List<VirtualMachineExtensi
     }
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -308,7 +308,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the VirtualMachineInstanceViewInner object itself.
@@ -319,7 +319,7 @@ public VirtualMachineInstanceViewInner withBootDiagnostics(BootDiagnosticsInstan
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -328,7 +328,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetExtensionInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetExtensionInner.java
index c846b8739ea3..fb2d9d32dcdc 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetExtensionInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetExtensionInner.java
@@ -79,7 +79,7 @@ public class VirtualMachineScaleSetExtensionInner extends SubResourceReadOnly {
     private String provisioningState;
 
     /**
-     * Get the name value.
+     * Get the name of the extension.
      *
      * @return the name value
      */
@@ -88,7 +88,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the extension.
      *
      * @param name the name value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -99,7 +99,7 @@ public VirtualMachineScaleSetExtensionInner withName(String name) {
     }
 
     /**
-     * Get the forceUpdateTag value.
+     * Get if a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed.
      *
      * @return the forceUpdateTag value
      */
@@ -108,7 +108,7 @@ public String forceUpdateTag() {
     }
 
     /**
-     * Set the forceUpdateTag value.
+     * Set if a value is provided and is different from the previous value, the extension handler will be forced to update even if the extension configuration has not changed.
      *
      * @param forceUpdateTag the forceUpdateTag value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -119,7 +119,7 @@ public VirtualMachineScaleSetExtensionInner withForceUpdateTag(String forceUpdat
     }
 
     /**
-     * Get the publisher value.
+     * Get the name of the extension handler publisher.
      *
      * @return the publisher value
      */
@@ -128,7 +128,7 @@ public String publisher() {
     }
 
     /**
-     * Set the publisher value.
+     * Set the name of the extension handler publisher.
      *
      * @param publisher the publisher value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -139,7 +139,7 @@ public VirtualMachineScaleSetExtensionInner withPublisher(String publisher) {
     }
 
     /**
-     * Get the type value.
+     * Get specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @return the type value
      */
@@ -148,7 +148,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set specifies the type of the extension; an example is "CustomScriptExtension".
      *
      * @param type the type value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -159,7 +159,7 @@ public VirtualMachineScaleSetExtensionInner withType(String type) {
     }
 
     /**
-     * Get the typeHandlerVersion value.
+     * Get specifies the version of the script handler.
      *
      * @return the typeHandlerVersion value
      */
@@ -168,7 +168,7 @@ public String typeHandlerVersion() {
     }
 
     /**
-     * Set the typeHandlerVersion value.
+     * Set specifies the version of the script handler.
      *
      * @param typeHandlerVersion the typeHandlerVersion value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -179,7 +179,7 @@ public VirtualMachineScaleSetExtensionInner withTypeHandlerVersion(String typeHa
     }
 
     /**
-     * Get the autoUpgradeMinorVersion value.
+     * Get indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @return the autoUpgradeMinorVersion value
      */
@@ -188,7 +188,7 @@ public Boolean autoUpgradeMinorVersion() {
     }
 
     /**
-     * Set the autoUpgradeMinorVersion value.
+     * Set indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
      *
      * @param autoUpgradeMinorVersion the autoUpgradeMinorVersion value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -199,7 +199,7 @@ public VirtualMachineScaleSetExtensionInner withAutoUpgradeMinorVersion(Boolean
     }
 
     /**
-     * Get the settings value.
+     * Get json formatted public settings for the extension.
      *
      * @return the settings value
      */
@@ -208,7 +208,7 @@ public Object settings() {
     }
 
     /**
-     * Set the settings value.
+     * Set json formatted public settings for the extension.
      *
      * @param settings the settings value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -219,7 +219,7 @@ public VirtualMachineScaleSetExtensionInner withSettings(Object settings) {
     }
 
     /**
-     * Get the protectedSettings value.
+     * Get the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @return the protectedSettings value
      */
@@ -228,7 +228,7 @@ public Object protectedSettings() {
     }
 
     /**
-     * Set the protectedSettings value.
+     * Set the extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.
      *
      * @param protectedSettings the protectedSettings value to set
      * @return the VirtualMachineScaleSetExtensionInner object itself.
@@ -239,7 +239,7 @@ public VirtualMachineScaleSetExtensionInner withProtectedSettings(Object protect
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInner.java
index ddb95c686660..56053bb66a89 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInner.java
@@ -105,7 +105,7 @@ public class VirtualMachineScaleSetInner extends Resource {
     private List<String> zones;
 
     /**
-     * Get the sku value.
+     * Get the virtual machine scale set sku.
      *
      * @return the sku value
      */
@@ -114,7 +114,7 @@ public Sku sku() {
     }
 
     /**
-     * Set the sku value.
+     * Set the virtual machine scale set sku.
      *
      * @param sku the sku value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -125,7 +125,7 @@ public VirtualMachineScaleSetInner withSku(Sku sku) {
     }
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -134,7 +134,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -145,7 +145,7 @@ public VirtualMachineScaleSetInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the upgradePolicy value.
+     * Get the upgrade policy.
      *
      * @return the upgradePolicy value
      */
@@ -154,7 +154,7 @@ public UpgradePolicy upgradePolicy() {
     }
 
     /**
-     * Set the upgradePolicy value.
+     * Set the upgrade policy.
      *
      * @param upgradePolicy the upgradePolicy value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -165,7 +165,7 @@ public VirtualMachineScaleSetInner withUpgradePolicy(UpgradePolicy upgradePolicy
     }
 
     /**
-     * Get the virtualMachineProfile value.
+     * Get the virtual machine profile.
      *
      * @return the virtualMachineProfile value
      */
@@ -174,7 +174,7 @@ public VirtualMachineScaleSetVMProfile virtualMachineProfile() {
     }
 
     /**
-     * Set the virtualMachineProfile value.
+     * Set the virtual machine profile.
      *
      * @param virtualMachineProfile the virtualMachineProfile value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -185,7 +185,7 @@ public VirtualMachineScaleSetInner withVirtualMachineProfile(VirtualMachineScale
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -194,7 +194,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the overprovision value.
+     * Get specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @return the overprovision value
      */
@@ -203,7 +203,7 @@ public Boolean overprovision() {
     }
 
     /**
-     * Set the overprovision value.
+     * Set specifies whether the Virtual Machine Scale Set should be overprovisioned.
      *
      * @param overprovision the overprovision value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -214,7 +214,7 @@ public VirtualMachineScaleSetInner withOverprovision(Boolean overprovision) {
     }
 
     /**
-     * Get the uniqueId value.
+     * Get specifies the ID which uniquely identifies a Virtual Machine Scale Set.
      *
      * @return the uniqueId value
      */
@@ -223,7 +223,7 @@ public String uniqueId() {
     }
 
     /**
-     * Get the singlePlacementGroup value.
+     * Get when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @return the singlePlacementGroup value
      */
@@ -232,7 +232,7 @@ public Boolean singlePlacementGroup() {
     }
 
     /**
-     * Set the singlePlacementGroup value.
+     * Set when true this limits the scale set to a single placement group, of max size 100 virtual machines.
      *
      * @param singlePlacementGroup the singlePlacementGroup value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -243,7 +243,7 @@ public VirtualMachineScaleSetInner withSinglePlacementGroup(Boolean singlePlacem
     }
 
     /**
-     * Get the zoneBalance value.
+     * Get whether to force stictly even Virtual Machine distribution cross x-zones in case there is zone outage.
      *
      * @return the zoneBalance value
      */
@@ -252,7 +252,7 @@ public Boolean zoneBalance() {
     }
 
     /**
-     * Set the zoneBalance value.
+     * Set whether to force stictly even Virtual Machine distribution cross x-zones in case there is zone outage.
      *
      * @param zoneBalance the zoneBalance value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -263,7 +263,7 @@ public VirtualMachineScaleSetInner withZoneBalance(Boolean zoneBalance) {
     }
 
     /**
-     * Get the platformFaultDomainCount value.
+     * Get fault Domain count for each placement group.
      *
      * @return the platformFaultDomainCount value
      */
@@ -272,7 +272,7 @@ public Integer platformFaultDomainCount() {
     }
 
     /**
-     * Set the platformFaultDomainCount value.
+     * Set fault Domain count for each placement group.
      *
      * @param platformFaultDomainCount the platformFaultDomainCount value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -283,7 +283,7 @@ public VirtualMachineScaleSetInner withPlatformFaultDomainCount(Integer platform
     }
 
     /**
-     * Get the identity value.
+     * Get the identity of the virtual machine scale set, if configured.
      *
      * @return the identity value
      */
@@ -292,7 +292,7 @@ public VirtualMachineScaleSetIdentity identity() {
     }
 
     /**
-     * Set the identity value.
+     * Set the identity of the virtual machine scale set, if configured.
      *
      * @param identity the identity value to set
      * @return the VirtualMachineScaleSetInner object itself.
@@ -303,7 +303,7 @@ public VirtualMachineScaleSetInner withIdentity(VirtualMachineScaleSetIdentity i
     }
 
     /**
-     * Get the zones value.
+     * Get the virtual machine scale set zones.
      *
      * @return the zones value
      */
@@ -312,7 +312,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the virtual machine scale set zones.
      *
      * @param zones the zones value to set
      * @return the VirtualMachineScaleSetInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInstanceViewInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInstanceViewInner.java
index 11d9b60747fd..9d6e2526326b 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInstanceViewInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetInstanceViewInner.java
@@ -37,7 +37,7 @@ public class VirtualMachineScaleSetInstanceViewInner {
     private List<InstanceViewStatus> statuses;
 
     /**
-     * Get the virtualMachine value.
+     * Get the instance view status summary for the virtual machine scale set.
      *
      * @return the virtualMachine value
      */
@@ -46,7 +46,7 @@ public VirtualMachineScaleSetInstanceViewStatusesSummary virtualMachine() {
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -55,7 +55,7 @@ public List<VirtualMachineScaleSetVMExtensionsSummary> extensions() {
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -64,7 +64,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineScaleSetInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetSkuInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetSkuInner.java
index 93da5395a124..306d43b2ee3d 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetSkuInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetSkuInner.java
@@ -35,7 +35,7 @@ public class VirtualMachineScaleSetSkuInner {
     private VirtualMachineScaleSetSkuCapacity capacity;
 
     /**
-     * Get the resourceType value.
+     * Get the type of resource the sku applies to.
      *
      * @return the resourceType value
      */
@@ -44,7 +44,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the sku value.
+     * Get the Sku.
      *
      * @return the sku value
      */
@@ -53,7 +53,7 @@ public Sku sku() {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
index 4d074eeefb9b..37eb2282fafb 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMImpl.java
@@ -21,7 +21,7 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.compute.v2017_12_01.Plan;
 import java.util.List;
-import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineScaleSetVMInstanceView;
 import java.util.ArrayList;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
 
@@ -107,10 +107,10 @@ public String instanceId() {
     }
 
     @Override
-    public VirtualMachineInstanceView instanceView() {
-        VirtualMachineInstanceViewInner inner = this.inner().instanceView();
+    public VirtualMachineScaleSetVMInstanceView instanceView() {
+        VirtualMachineScaleSetVMInstanceViewInner inner = this.inner().instanceView();
         if (inner != null) {
-            return  new VirtualMachineInstanceViewImpl(inner, manager());
+            return  new VirtualMachineScaleSetVMInstanceViewImpl(inner, manager());
         } else {
             return null;
         }
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
index e95dbb7a6845..f6a8ffa23a73 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInner.java
@@ -55,7 +55,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
      * The virtual machine instance view.
      */
     @JsonProperty(value = "properties.instanceView", access = JsonProperty.Access.WRITE_ONLY)
-    private VirtualMachineInstanceViewInner instanceView;
+    private VirtualMachineScaleSetVMInstanceViewInner instanceView;
 
     /**
      * Specifies the hardware settings for the virtual machine.
@@ -145,7 +145,7 @@ public class VirtualMachineScaleSetVMInner extends Resource {
     private List<VirtualMachineExtensionInner> resources;
 
     /**
-     * Get the instanceId value.
+     * Get the virtual machine instance ID.
      *
      * @return the instanceId value
      */
@@ -154,7 +154,7 @@ public String instanceId() {
     }
 
     /**
-     * Get the sku value.
+     * Get the virtual machine SKU.
      *
      * @return the sku value
      */
@@ -163,7 +163,7 @@ public Sku sku() {
     }
 
     /**
-     * Get the latestModelApplied value.
+     * Get specifies whether the latest model has been applied to the virtual machine.
      *
      * @return the latestModelApplied value
      */
@@ -172,7 +172,7 @@ public Boolean latestModelApplied() {
     }
 
     /**
-     * Get the vmId value.
+     * Get azure VM unique ID.
      *
      * @return the vmId value
      */
@@ -181,16 +181,16 @@ public String vmId() {
     }
 
     /**
-     * Get the instanceView value.
+     * Get the virtual machine instance view.
      *
      * @return the instanceView value
      */
-    public VirtualMachineInstanceViewInner instanceView() {
+    public VirtualMachineScaleSetVMInstanceViewInner instanceView() {
         return this.instanceView;
     }
 
     /**
-     * Get the hardwareProfile value.
+     * Get specifies the hardware settings for the virtual machine.
      *
      * @return the hardwareProfile value
      */
@@ -199,7 +199,7 @@ public HardwareProfile hardwareProfile() {
     }
 
     /**
-     * Set the hardwareProfile value.
+     * Set specifies the hardware settings for the virtual machine.
      *
      * @param hardwareProfile the hardwareProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -210,7 +210,7 @@ public VirtualMachineScaleSetVMInner withHardwareProfile(HardwareProfile hardwar
     }
 
     /**
-     * Get the storageProfile value.
+     * Get specifies the storage settings for the virtual machine disks.
      *
      * @return the storageProfile value
      */
@@ -219,7 +219,7 @@ public StorageProfile storageProfile() {
     }
 
     /**
-     * Set the storageProfile value.
+     * Set specifies the storage settings for the virtual machine disks.
      *
      * @param storageProfile the storageProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -230,7 +230,7 @@ public VirtualMachineScaleSetVMInner withStorageProfile(StorageProfile storagePr
     }
 
     /**
-     * Get the osProfile value.
+     * Get specifies the operating system settings for the virtual machine.
      *
      * @return the osProfile value
      */
@@ -239,7 +239,7 @@ public OSProfile osProfile() {
     }
 
     /**
-     * Set the osProfile value.
+     * Set specifies the operating system settings for the virtual machine.
      *
      * @param osProfile the osProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -250,7 +250,7 @@ public VirtualMachineScaleSetVMInner withOsProfile(OSProfile osProfile) {
     }
 
     /**
-     * Get the networkProfile value.
+     * Get specifies the network interfaces of the virtual machine.
      *
      * @return the networkProfile value
      */
@@ -259,7 +259,7 @@ public NetworkProfile networkProfile() {
     }
 
     /**
-     * Set the networkProfile value.
+     * Set specifies the network interfaces of the virtual machine.
      *
      * @param networkProfile the networkProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -270,7 +270,7 @@ public VirtualMachineScaleSetVMInner withNetworkProfile(NetworkProfile networkPr
     }
 
     /**
-     * Get the diagnosticsProfile value.
+     * Get specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @return the diagnosticsProfile value
      */
@@ -279,7 +279,7 @@ public DiagnosticsProfile diagnosticsProfile() {
     }
 
     /**
-     * Set the diagnosticsProfile value.
+     * Set specifies the boot diagnostic settings state. &lt;br&gt;&lt;br&gt;Minimum api-version: 2015-06-15.
      *
      * @param diagnosticsProfile the diagnosticsProfile value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -290,7 +290,7 @@ public VirtualMachineScaleSetVMInner withDiagnosticsProfile(DiagnosticsProfile d
     }
 
     /**
-     * Get the availabilitySet value.
+     * Get specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @return the availabilitySet value
      */
@@ -299,7 +299,7 @@ public SubResource availabilitySet() {
     }
 
     /**
-     * Set the availabilitySet value.
+     * Set specifies information about the availability set that the virtual machine should be assigned to. Virtual machines specified in the same availability set are allocated to different nodes to maximize availability. For more information about availability sets, see [Manage the availability of virtual machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json). &lt;br&gt;&lt;br&gt; For more information on Azure planned maintainance, see [Planned maintenance for virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Currently, a VM can only be added to availability set at creation time. An existing VM cannot be added to an availability set.
      *
      * @param availabilitySet the availabilitySet value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -310,7 +310,7 @@ public VirtualMachineScaleSetVMInner withAvailabilitySet(SubResource availabilit
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the provisioning state, which only appears in the response.
      *
      * @return the provisioningState value
      */
@@ -319,7 +319,7 @@ public String provisioningState() {
     }
 
     /**
-     * Get the licenseType value.
+     * Get specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @return the licenseType value
      */
@@ -328,7 +328,7 @@ public String licenseType() {
     }
 
     /**
-     * Set the licenseType value.
+     * Set specifies that the image or disk that is being used was licensed on-premises. This element is only used for images that contain the Windows Server operating system. &lt;br&gt;&lt;br&gt; Possible values are: &lt;br&gt;&lt;br&gt; Windows_Client &lt;br&gt;&lt;br&gt; Windows_Server &lt;br&gt;&lt;br&gt; If this element is included in a request for an update, the value must match the initial value. This value cannot be updated. &lt;br&gt;&lt;br&gt; For more information, see [Azure Hybrid Use Benefit for Windows Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json) &lt;br&gt;&lt;br&gt; Minimum api-version: 2015-06-15.
      *
      * @param licenseType the licenseType value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -339,7 +339,7 @@ public VirtualMachineScaleSetVMInner withLicenseType(String licenseType) {
     }
 
     /**
-     * Get the plan value.
+     * Get specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @return the plan value
      */
@@ -348,7 +348,7 @@ public Plan plan() {
     }
 
     /**
-     * Set the plan value.
+     * Set specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use.  In the Azure portal, find the marketplace image that you want to use and then click **Want to deploy programmatically, Get Started -&gt;**. Enter any required information and then click **Save**.
      *
      * @param plan the plan value to set
      * @return the VirtualMachineScaleSetVMInner object itself.
@@ -359,7 +359,7 @@ public VirtualMachineScaleSetVMInner withPlan(Plan plan) {
     }
 
     /**
-     * Get the resources value.
+     * Get the virtual machine child extension resources.
      *
      * @return the resources value
      */
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInstanceViewInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
index fff6826a9404..dd787d10a611 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetVMInstanceViewInner.java
@@ -95,7 +95,7 @@ public class VirtualMachineScaleSetVMInstanceViewInner {
     private String placementGroupId;
 
     /**
-     * Get the platformUpdateDomain value.
+     * Get the Update Domain count.
      *
      * @return the platformUpdateDomain value
      */
@@ -104,7 +104,7 @@ public Integer platformUpdateDomain() {
     }
 
     /**
-     * Set the platformUpdateDomain value.
+     * Set the Update Domain count.
      *
      * @param platformUpdateDomain the platformUpdateDomain value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -115,7 +115,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withPlatformUpdateDomain(Intege
     }
 
     /**
-     * Get the platformFaultDomain value.
+     * Get the Fault Domain count.
      *
      * @return the platformFaultDomain value
      */
@@ -124,7 +124,7 @@ public Integer platformFaultDomain() {
     }
 
     /**
-     * Set the platformFaultDomain value.
+     * Set the Fault Domain count.
      *
      * @param platformFaultDomain the platformFaultDomain value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -135,7 +135,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withPlatformFaultDomain(Integer
     }
 
     /**
-     * Get the rdpThumbPrint value.
+     * Get the Remote desktop certificate thumbprint.
      *
      * @return the rdpThumbPrint value
      */
@@ -144,7 +144,7 @@ public String rdpThumbPrint() {
     }
 
     /**
-     * Set the rdpThumbPrint value.
+     * Set the Remote desktop certificate thumbprint.
      *
      * @param rdpThumbPrint the rdpThumbPrint value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -155,7 +155,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withRdpThumbPrint(String rdpThu
     }
 
     /**
-     * Get the vmAgent value.
+     * Get the VM Agent running on the virtual machine.
      *
      * @return the vmAgent value
      */
@@ -164,7 +164,7 @@ public VirtualMachineAgentInstanceView vmAgent() {
     }
 
     /**
-     * Set the vmAgent value.
+     * Set the VM Agent running on the virtual machine.
      *
      * @param vmAgent the vmAgent value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -175,7 +175,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withVmAgent(VirtualMachineAgent
     }
 
     /**
-     * Get the maintenanceRedeployStatus value.
+     * Get the Maintenance Operation status on the virtual machine.
      *
      * @return the maintenanceRedeployStatus value
      */
@@ -184,7 +184,7 @@ public MaintenanceRedeployStatus maintenanceRedeployStatus() {
     }
 
     /**
-     * Set the maintenanceRedeployStatus value.
+     * Set the Maintenance Operation status on the virtual machine.
      *
      * @param maintenanceRedeployStatus the maintenanceRedeployStatus value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -195,7 +195,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withMaintenanceRedeployStatus(M
     }
 
     /**
-     * Get the disks value.
+     * Get the disks information.
      *
      * @return the disks value
      */
@@ -204,7 +204,7 @@ public List<DiskInstanceView> disks() {
     }
 
     /**
-     * Set the disks value.
+     * Set the disks information.
      *
      * @param disks the disks value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -215,7 +215,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withDisks(List<DiskInstanceView
     }
 
     /**
-     * Get the extensions value.
+     * Get the extensions information.
      *
      * @return the extensions value
      */
@@ -224,7 +224,7 @@ public List<VirtualMachineExtensionInstanceView> extensions() {
     }
 
     /**
-     * Set the extensions value.
+     * Set the extensions information.
      *
      * @param extensions the extensions value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -235,7 +235,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withExtensions(List<VirtualMach
     }
 
     /**
-     * Get the vmHealth value.
+     * Get the health status for the VM.
      *
      * @return the vmHealth value
      */
@@ -244,7 +244,7 @@ public VirtualMachineHealthStatus vmHealth() {
     }
 
     /**
-     * Get the bootDiagnostics value.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -253,7 +253,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * Set the bootDiagnostics value.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; For Linux Virtual Machines, you can easily view the output of your console log. &lt;br&gt;&lt;br&gt; For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @param bootDiagnostics the bootDiagnostics value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -264,7 +264,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withBootDiagnostics(BootDiagnos
     }
 
     /**
-     * Get the statuses value.
+     * Get the resource status information.
      *
      * @return the statuses value
      */
@@ -273,7 +273,7 @@ public List<InstanceViewStatus> statuses() {
     }
 
     /**
-     * Set the statuses value.
+     * Set the resource status information.
      *
      * @param statuses the statuses value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
@@ -284,7 +284,7 @@ public VirtualMachineScaleSetVMInstanceViewInner withStatuses(List<InstanceViewS
     }
 
     /**
-     * Get the placementGroupId value.
+     * Get the placement group in which the VM is running. If the VM is deallocated it will not have a placementGroupId.
      *
      * @return the placementGroupId value
      */
@@ -293,7 +293,7 @@ public String placementGroupId() {
     }
 
     /**
-     * Set the placementGroupId value.
+     * Set the placement group in which the VM is running. If the VM is deallocated it will not have a placementGroupId.
      *
      * @param placementGroupId the placementGroupId value to set
      * @return the VirtualMachineScaleSetVMInstanceViewInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsImpl.java
index 26e2ff1958fc..71b2ad876e93 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsImpl.java
@@ -176,7 +176,8 @@ public Observable<UpgradeOperationHistoricalStatusInfo> getOSUpgradeHistoryAsync
             public Iterable<UpgradeOperationHistoricalStatusInfoInner> call(Page<UpgradeOperationHistoricalStatusInfoInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<UpgradeOperationHistoricalStatusInfoInner, UpgradeOperationHistoricalStatusInfo>() {
+        })
+        .map(new Func1<UpgradeOperationHistoricalStatusInfoInner, UpgradeOperationHistoricalStatusInfo>() {
             @Override
             public UpgradeOperationHistoricalStatusInfo call(UpgradeOperationHistoricalStatusInfoInner inner) {
                 return new UpgradeOperationHistoricalStatusInfoImpl(inner, manager());
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsInner.java
index ceb67b6a912b..bf129b7a349f 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineScaleSetsInner.java
@@ -3181,7 +3181,7 @@ private ServiceResponse<OperationStatusResponseInner> beginRedeployDelegate(Resp
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3195,7 +3195,7 @@ public OperationStatusResponseInner performMaintenance(String resourceGroupName,
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3208,7 +3208,7 @@ public ServiceFuture<OperationStatusResponseInner> performMaintenanceAsync(Strin
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3225,7 +3225,7 @@ public OperationStatusResponseInner call(ServiceResponse<OperationStatusResponse
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3252,7 +3252,7 @@ public Observable<ServiceResponse<OperationStatusResponseInner>> performMaintena
         return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<OperationStatusResponseInner>() { }.getType());
     }
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3267,7 +3267,7 @@ public OperationStatusResponseInner performMaintenance(String resourceGroupName,
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3281,7 +3281,7 @@ public ServiceFuture<OperationStatusResponseInner> performMaintenanceAsync(Strin
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3299,7 +3299,7 @@ public OperationStatusResponseInner call(ServiceResponse<OperationStatusResponse
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3331,7 +3331,7 @@ public Observable<ServiceResponse<OperationStatusResponseInner>> performMaintena
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3345,7 +3345,7 @@ public OperationStatusResponseInner beginPerformMaintenance(String resourceGroup
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3358,7 +3358,7 @@ public ServiceFuture<OperationStatusResponseInner> beginPerformMaintenanceAsync(
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3375,7 +3375,7 @@ public OperationStatusResponseInner call(ServiceResponse<OperationStatusResponse
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3413,7 +3413,7 @@ public Observable<ServiceResponse<OperationStatusResponseInner>> call(Response<R
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3428,7 +3428,7 @@ public OperationStatusResponseInner beginPerformMaintenance(String resourceGroup
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3442,7 +3442,7 @@ public ServiceFuture<OperationStatusResponseInner> beginPerformMaintenanceAsync(
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
@@ -3460,7 +3460,7 @@ public OperationStatusResponseInner call(ServiceResponse<OperationStatusResponse
     }
 
     /**
-     * Perform maintenance on one or more virtual machines in a VM scale set.
+     * Perform maintenance on one or more virtual machines in a VM scale set. Operation on instances which are not eligible for perform maintenance will be failed. Please refer to best practices for more details: https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-maintenance-notifications.
      *
      * @param resourceGroupName The name of the resource group.
      * @param vmScaleSetName The name of the VM scale set.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineSizeInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineSizeInner.java
index 6268a4b674e1..97bf7798135a 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineSizeInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineSizeInner.java
@@ -52,7 +52,7 @@ public class VirtualMachineSizeInner {
     private Integer maxDataDiskCount;
 
     /**
-     * Get the name value.
+     * Get the name of the virtual machine size.
      *
      * @return the name value
      */
@@ -61,7 +61,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the virtual machine size.
      *
      * @param name the name value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -72,7 +72,7 @@ public VirtualMachineSizeInner withName(String name) {
     }
 
     /**
-     * Get the numberOfCores value.
+     * Get the number of cores supported by the virtual machine size.
      *
      * @return the numberOfCores value
      */
@@ -81,7 +81,7 @@ public Integer numberOfCores() {
     }
 
     /**
-     * Set the numberOfCores value.
+     * Set the number of cores supported by the virtual machine size.
      *
      * @param numberOfCores the numberOfCores value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -92,7 +92,7 @@ public VirtualMachineSizeInner withNumberOfCores(Integer numberOfCores) {
     }
 
     /**
-     * Get the osDiskSizeInMB value.
+     * Get the OS disk size, in MB, allowed by the virtual machine size.
      *
      * @return the osDiskSizeInMB value
      */
@@ -101,7 +101,7 @@ public Integer osDiskSizeInMB() {
     }
 
     /**
-     * Set the osDiskSizeInMB value.
+     * Set the OS disk size, in MB, allowed by the virtual machine size.
      *
      * @param osDiskSizeInMB the osDiskSizeInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -112,7 +112,7 @@ public VirtualMachineSizeInner withOsDiskSizeInMB(Integer osDiskSizeInMB) {
     }
 
     /**
-     * Get the resourceDiskSizeInMB value.
+     * Get the resource disk size, in MB, allowed by the virtual machine size.
      *
      * @return the resourceDiskSizeInMB value
      */
@@ -121,7 +121,7 @@ public Integer resourceDiskSizeInMB() {
     }
 
     /**
-     * Set the resourceDiskSizeInMB value.
+     * Set the resource disk size, in MB, allowed by the virtual machine size.
      *
      * @param resourceDiskSizeInMB the resourceDiskSizeInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -132,7 +132,7 @@ public VirtualMachineSizeInner withResourceDiskSizeInMB(Integer resourceDiskSize
     }
 
     /**
-     * Get the memoryInMB value.
+     * Get the amount of memory, in MB, supported by the virtual machine size.
      *
      * @return the memoryInMB value
      */
@@ -141,7 +141,7 @@ public Integer memoryInMB() {
     }
 
     /**
-     * Set the memoryInMB value.
+     * Set the amount of memory, in MB, supported by the virtual machine size.
      *
      * @param memoryInMB the memoryInMB value to set
      * @return the VirtualMachineSizeInner object itself.
@@ -152,7 +152,7 @@ public VirtualMachineSizeInner withMemoryInMB(Integer memoryInMB) {
     }
 
     /**
-     * Get the maxDataDiskCount value.
+     * Get the maximum number of data disks that can be attached to the virtual machine size.
      *
      * @return the maxDataDiskCount value
      */
@@ -161,7 +161,7 @@ public Integer maxDataDiskCount() {
     }
 
     /**
-     * Set the maxDataDiskCount value.
+     * Set the maximum number of data disks that can be attached to the virtual machine size.
      *
      * @param maxDataDiskCount the maxDataDiskCount value to set
      * @return the VirtualMachineSizeInner object itself.
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesImpl.java
new file mode 100644
index 000000000000..cbc250caa010
--- /dev/null
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesImpl.java
@@ -0,0 +1,313 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * def
+ */
+
+package com.microsoft.azure.management.compute.v2017_12_01.implementation;
+
+import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachines;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachine;
+import rx.Observable;
+import rx.Completable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import com.microsoft.azure.arm.resources.ResourceUtilsCore;
+import com.microsoft.azure.arm.utils.RXMapper;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineCaptureResult;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineInstanceView;
+import com.microsoft.azure.management.compute.v2017_12_01.OperationStatusResponse;
+import com.microsoft.azure.management.compute.v2017_12_01.RunCommandResult;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineCaptureParameters;
+import com.microsoft.azure.management.compute.v2017_12_01.RunCommandInput;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtensionsListResult;
+import java.util.List;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineVirtualMachineSize;
+
+class VirtualMachinesImpl extends GroupableResourcesCoreImpl<VirtualMachine, VirtualMachineImpl, VirtualMachineInner, VirtualMachinesInner, ComputeManager>  implements VirtualMachines {
+    protected VirtualMachinesImpl(ComputeManager manager) {
+        super(manager.inner().virtualMachines(), manager);
+    }
+
+    @Override
+    protected Observable<VirtualMachineInner> getInnerAsync(String resourceGroupName, String name) {
+        VirtualMachinesInner client = this.inner();
+        return client.getByResourceGroupAsync(resourceGroupName, name);
+    }
+
+    @Override
+    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
+        VirtualMachinesInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(Collection<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            return Observable.empty();
+        }
+        Collection<Observable<String>> observables = new ArrayList<>();
+        for (String id : ids) {
+            final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id);
+            final String name = ResourceUtilsCore.nameFromResourceId(id);
+            Observable<String> o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id);
+            observables.add(o);
+        }
+        return Observable.mergeDelayError(observables);
+    }
+
+    @Override
+    public Observable<String> deleteByIdsAsync(String...ids) {
+        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public void deleteByIds(Collection<String> ids) {
+        if (ids != null && !ids.isEmpty()) {
+            this.deleteByIdsAsync(ids).toBlocking().last();
+        }
+    }
+
+    @Override
+    public void deleteByIds(String...ids) {
+        this.deleteByIds(new ArrayList<String>(Arrays.asList(ids)));
+    }
+
+    @Override
+    public PagedList<VirtualMachine> listByResourceGroup(String resourceGroupName) {
+        VirtualMachinesInner client = this.inner();
+        return this.wrapList(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<VirtualMachine> listByResourceGroupAsync(String resourceGroupName) {
+        VirtualMachinesInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
+            @Override
+            public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
+            @Override
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<VirtualMachine> list() {
+        VirtualMachinesInner client = this.inner();
+        return this.wrapList(client.list());
+    }
+
+    @Override
+    public Observable<VirtualMachine> listAsync() {
+        VirtualMachinesInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
+            @Override
+            public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
+            @Override
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public VirtualMachineImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    @Override
+    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
+        VirtualMachinesInner client = this.inner();
+        return client.captureAsync(resourceGroupName, vmName, parameters)
+        .map(new Func1<VirtualMachineCaptureResultInner, VirtualMachineCaptureResult>() {
+            @Override
+            public VirtualMachineCaptureResult call(VirtualMachineCaptureResultInner inner) {
+                return new VirtualMachineCaptureResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualMachineInstanceView> instanceViewAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.instanceViewAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineInstanceViewInner, VirtualMachineInstanceView>() {
+            @Override
+            public VirtualMachineInstanceView call(VirtualMachineInstanceViewInner inner) {
+                return new VirtualMachineInstanceViewImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> convertToManagedDisksAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.convertToManagedDisksAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> deallocateAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.deallocateAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> generalizeAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.generalizeAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> powerOffAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.powerOffAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> restartAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.restartAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> startAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.startAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> redeployAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.redeployAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<OperationStatusResponse> performMaintenanceAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.performMaintenanceAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
+            @Override
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<RunCommandResult> runCommandAsync(String resourceGroupName, String vmName, RunCommandInput parameters) {
+        VirtualMachinesInner client = this.inner();
+        return client.runCommandAsync(resourceGroupName, vmName, parameters)
+        .map(new Func1<RunCommandResultInner, RunCommandResult>() {
+            @Override
+            public RunCommandResult call(RunCommandResultInner inner) {
+                return new RunCommandResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    protected VirtualMachineImpl wrapModel(VirtualMachineInner inner) {
+        return  new VirtualMachineImpl(inner.name(), inner, manager());
+    }
+
+    @Override
+    protected VirtualMachineImpl wrapModel(String name) {
+        return new VirtualMachineImpl(name, new VirtualMachineInner(), this.manager());
+    }
+
+    private VirtualMachineVirtualMachineSizeImpl wrapVirtualMachineVirtualMachineSizeModel(VirtualMachineSizeInner inner) {
+        return  new VirtualMachineVirtualMachineSizeImpl(inner, manager());
+    }
+
+    @Override
+    public Observable<VirtualMachineExtensionsListResult> getExtensionsAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.getExtensionsAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineExtensionsListResultInner, VirtualMachineExtensionsListResult>() {
+            @Override
+            public VirtualMachineExtensionsListResult call(VirtualMachineExtensionsListResultInner inner) {
+                return new VirtualMachineExtensionsListResultImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<VirtualMachineVirtualMachineSize> listAvailableSizesAsync(String resourceGroupName, String vmName) {
+        VirtualMachinesInner client = this.inner();
+        return client.listAvailableSizesAsync(resourceGroupName, vmName)
+        .flatMap(new Func1<List<VirtualMachineSizeInner>, Observable<VirtualMachineSizeInner>>() {
+            @Override
+            public Observable<VirtualMachineSizeInner> call(List<VirtualMachineSizeInner> innerList) {
+                return Observable.from(innerList);
+            }
+        })
+        .map(new Func1<VirtualMachineSizeInner, VirtualMachineVirtualMachineSize>() {
+            @Override
+            public VirtualMachineVirtualMachineSize call(VirtualMachineSizeInner inner) {
+                return wrapVirtualMachineVirtualMachineSizeModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/compute/resource-manager/v2018_04_01/pom.xml b/compute/resource-manager/v2018_04_01/pom.xml
index 71c6e1b2b929..fd4e92f2c63d 100644
--- a/compute/resource-manager/v2018_04_01/pom.xml
+++ b/compute/resource-manager/v2018_04_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.compute.v2018_04_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-compute</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Compute Management</name>
-    <description>This package contains Microsoft Compute Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.compute.v2018_04_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-compute</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Compute Management</name>
+    <description>This package contains Microsoft Compute Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
index a87d4de13915..fc7b1af28ba8 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
@@ -51,7 +51,7 @@ public class CreationData {
     private String sourceResourceId;
 
     /**
-     * Get the createOption value.
+     * Get this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy', 'Restore'.
      *
      * @return the createOption value
      */
@@ -60,7 +60,7 @@ public DiskCreateOption createOption() {
     }
 
     /**
-     * Set the createOption value.
+     * Set this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy', 'Restore'.
      *
      * @param createOption the createOption value to set
      * @return the CreationData object itself.
@@ -71,7 +71,7 @@ public CreationData withCreateOption(DiskCreateOption createOption) {
     }
 
     /**
-     * Get the storageAccountId value.
+     * Get if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
      *
      * @return the storageAccountId value
      */
@@ -80,7 +80,7 @@ public String storageAccountId() {
     }
 
     /**
-     * Set the storageAccountId value.
+     * Set if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
      *
      * @param storageAccountId the storageAccountId value to set
      * @return the CreationData object itself.
@@ -91,7 +91,7 @@ public CreationData withStorageAccountId(String storageAccountId) {
     }
 
     /**
-     * Get the imageReference value.
+     * Get disk source information.
      *
      * @return the imageReference value
      */
@@ -100,7 +100,7 @@ public ImageDiskReference imageReference() {
     }
 
     /**
-     * Set the imageReference value.
+     * Set disk source information.
      *
      * @param imageReference the imageReference value to set
      * @return the CreationData object itself.
@@ -111,7 +111,7 @@ public CreationData withImageReference(ImageDiskReference imageReference) {
     }
 
     /**
-     * Get the sourceUri value.
+     * Get if createOption is Import, this is the URI of a blob to be imported into a managed disk.
      *
      * @return the sourceUri value
      */
@@ -120,7 +120,7 @@ public String sourceUri() {
     }
 
     /**
-     * Set the sourceUri value.
+     * Set if createOption is Import, this is the URI of a blob to be imported into a managed disk.
      *
      * @param sourceUri the sourceUri value to set
      * @return the CreationData object itself.
@@ -131,7 +131,7 @@ public CreationData withSourceUri(String sourceUri) {
     }
 
     /**
-     * Get the sourceResourceId value.
+     * Get if createOption is Copy, this is the ARM id of the source snapshot or disk.
      *
      * @return the sourceResourceId value
      */
@@ -140,7 +140,7 @@ public String sourceResourceId() {
     }
 
     /**
-     * Set the sourceResourceId value.
+     * Set if createOption is Copy, this is the ARM id of the source snapshot or disk.
      *
      * @param sourceResourceId the sourceResourceId value to set
      * @return the CreationData object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
index 7c48e8958d0f..0fc57d782dd3 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2018_04_01.implementation.ComputeManager;
 import java.util.List;
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
index 097f3fb3ec28..67754d466609 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
@@ -11,11 +11,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * The disks sku name. Can be Standard_LRS or Premium_LRS.
+ * The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
  */
 public class DiskSku {
     /**
-     * The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS'.
+     * The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     * 'StandardSSD_LRS'.
      */
     @JsonProperty(value = "name")
     private StorageAccountTypes name;
@@ -27,7 +28,7 @@ public class DiskSku {
     private String tier;
 
     /**
-     * Get the name value.
+     * Get the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
      *
      * @return the name value
      */
@@ -36,7 +37,7 @@ public StorageAccountTypes name() {
     }
 
     /**
-     * Set the name value.
+     * Set the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
      *
      * @param name the name value to set
      * @return the DiskSku object itself.
@@ -47,7 +48,7 @@ public DiskSku withName(StorageAccountTypes name) {
     }
 
     /**
-     * Get the tier value.
+     * Get the sku tier.
      *
      * @return the tier value
      */
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
index f5602037c9d5..feb7386edaa1 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
@@ -52,7 +52,7 @@ public class DiskUpdate {
     private DiskSku sku;
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -61,7 +61,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the DiskUpdate object itself.
@@ -72,7 +72,7 @@ public DiskUpdate withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -81,7 +81,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DiskUpdate object itself.
@@ -92,7 +92,7 @@ public DiskUpdate withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -101,7 +101,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskUpdate object itself.
@@ -112,7 +112,7 @@ public DiskUpdate withEncryptionSettings(EncryptionSettings encryptionSettings)
     }
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -121,7 +121,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the DiskUpdate object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java
index a5241ab8fc1c..fc35f8a0efdb 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java
@@ -37,7 +37,7 @@ public class EncryptionSettings {
     private KeyVaultAndKeyReference keyEncryptionKey;
 
     /**
-     * Get the enabled value.
+     * Get set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged.
      *
      * @return the enabled value
      */
@@ -46,7 +46,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled value.
+     * Set set this flag to true and provide DiskEncryptionKey and optional KeyEncryptionKey to enable encryption. Set this flag to false and remove DiskEncryptionKey and KeyEncryptionKey to disable encryption. If EncryptionSettings is null in the request object, the existing settings remain unchanged.
      *
      * @param enabled the enabled value to set
      * @return the EncryptionSettings object itself.
@@ -57,7 +57,7 @@ public EncryptionSettings withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get the diskEncryptionKey value.
+     * Get key Vault Secret Url and vault id of the disk encryption key.
      *
      * @return the diskEncryptionKey value
      */
@@ -66,7 +66,7 @@ public KeyVaultAndSecretReference diskEncryptionKey() {
     }
 
     /**
-     * Set the diskEncryptionKey value.
+     * Set key Vault Secret Url and vault id of the disk encryption key.
      *
      * @param diskEncryptionKey the diskEncryptionKey value to set
      * @return the EncryptionSettings object itself.
@@ -77,7 +77,7 @@ public EncryptionSettings withDiskEncryptionKey(KeyVaultAndSecretReference diskE
     }
 
     /**
-     * Get the keyEncryptionKey value.
+     * Get key Vault Key Url and vault id of the key encryption key.
      *
      * @return the keyEncryptionKey value
      */
@@ -86,7 +86,7 @@ public KeyVaultAndKeyReference keyEncryptionKey() {
     }
 
     /**
-     * Set the keyEncryptionKey value.
+     * Set key Vault Key Url and vault id of the key encryption key.
      *
      * @param keyEncryptionKey the keyEncryptionKey value to set
      * @return the EncryptionSettings object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java
index 2acd3f446e0b..9900d5d6e582 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java
@@ -27,7 +27,7 @@ public class GrantAccessData {
     private int durationInSeconds;
 
     /**
-     * Get the access value.
+     * Get possible values include: 'None', 'Read'.
      *
      * @return the access value
      */
@@ -36,7 +36,7 @@ public AccessLevel access() {
     }
 
     /**
-     * Set the access value.
+     * Set possible values include: 'None', 'Read'.
      *
      * @param access the access value to set
      * @return the GrantAccessData object itself.
@@ -47,7 +47,7 @@ public GrantAccessData withAccess(AccessLevel access) {
     }
 
     /**
-     * Get the durationInSeconds value.
+     * Get time duration in seconds until the SAS access expires.
      *
      * @return the durationInSeconds value
      */
@@ -56,7 +56,7 @@ public int durationInSeconds() {
     }
 
     /**
-     * Set the durationInSeconds value.
+     * Set time duration in seconds until the SAS access expires.
      *
      * @param durationInSeconds the durationInSeconds value to set
      * @return the GrantAccessData object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
index cc8e4681e2e8..21981e91ad5c 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
@@ -30,7 +30,7 @@ public class ImageDiskReference {
     private Integer lun;
 
     /**
-     * Get the id value.
+     * Get a relative uri containing either a Platform Imgage Repository or user image reference.
      *
      * @return the id value
      */
@@ -39,7 +39,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set a relative uri containing either a Platform Imgage Repository or user image reference.
      *
      * @param id the id value to set
      * @return the ImageDiskReference object itself.
@@ -50,7 +50,7 @@ public ImageDiskReference withId(String id) {
     }
 
     /**
-     * Get the lun value.
+     * Get if the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
      *
      * @return the lun value
      */
@@ -59,7 +59,7 @@ public Integer lun() {
     }
 
     /**
-     * Set the lun value.
+     * Set if the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
      *
      * @param lun the lun value to set
      * @return the ImageDiskReference object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java
index 90267cab5b20..1c6f73aa511c 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java
@@ -28,7 +28,7 @@ public class KeyVaultAndKeyReference {
     private String keyUrl;
 
     /**
-     * Get the sourceVault value.
+     * Get resource id of the KeyVault containing the key or secret.
      *
      * @return the sourceVault value
      */
@@ -37,7 +37,7 @@ public SourceVault sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set resource id of the KeyVault containing the key or secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultAndKeyReference object itself.
@@ -48,7 +48,7 @@ public KeyVaultAndKeyReference withSourceVault(SourceVault sourceVault) {
     }
 
     /**
-     * Get the keyUrl value.
+     * Get url pointing to a key or secret in KeyVault.
      *
      * @return the keyUrl value
      */
@@ -57,7 +57,7 @@ public String keyUrl() {
     }
 
     /**
-     * Set the keyUrl value.
+     * Set url pointing to a key or secret in KeyVault.
      *
      * @param keyUrl the keyUrl value to set
      * @return the KeyVaultAndKeyReference object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java
index 6c10230ace1e..7401445d48ae 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java
@@ -27,7 +27,7 @@ public class KeyVaultAndSecretReference {
     private String secretUrl;
 
     /**
-     * Get the sourceVault value.
+     * Get resource id of the KeyVault containing the key or secret.
      *
      * @return the sourceVault value
      */
@@ -36,7 +36,7 @@ public SourceVault sourceVault() {
     }
 
     /**
-     * Set the sourceVault value.
+     * Set resource id of the KeyVault containing the key or secret.
      *
      * @param sourceVault the sourceVault value to set
      * @return the KeyVaultAndSecretReference object itself.
@@ -47,7 +47,7 @@ public KeyVaultAndSecretReference withSourceVault(SourceVault sourceVault) {
     }
 
     /**
-     * Get the secretUrl value.
+     * Get url pointing to a key or secret in KeyVault.
      *
      * @return the secretUrl value
      */
@@ -56,7 +56,7 @@ public String secretUrl() {
     }
 
     /**
-     * Set the secretUrl value.
+     * Set url pointing to a key or secret in KeyVault.
      *
      * @param secretUrl the secretUrl value to set
      * @return the KeyVaultAndSecretReference object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java
index 92adc4673818..6677cc56c14e 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.compute.v2018_04_01.implementation.ComputeManager;
 import org.joda.time.DateTime;
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java
index bc818ea5a01d..22d99739aba3 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java
@@ -28,7 +28,7 @@ public class SnapshotSku {
     private String tier;
 
     /**
-     * Get the name value.
+     * Get the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'Standard_ZRS'.
      *
      * @return the name value
      */
@@ -37,7 +37,7 @@ public SnapshotStorageAccountTypes name() {
     }
 
     /**
-     * Set the name value.
+     * Set the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'Standard_ZRS'.
      *
      * @param name the name value to set
      * @return the SnapshotSku object itself.
@@ -48,7 +48,7 @@ public SnapshotSku withName(SnapshotStorageAccountTypes name) {
     }
 
     /**
-     * Get the tier value.
+     * Get the sku tier.
      *
      * @return the tier value
      */
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java
index 12720526308c..49b4e929c422 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java
@@ -52,7 +52,7 @@ public class SnapshotUpdate {
     private SnapshotSku sku;
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -61,7 +61,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the SnapshotUpdate object itself.
@@ -72,7 +72,7 @@ public SnapshotUpdate withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -81,7 +81,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the SnapshotUpdate object itself.
@@ -92,7 +92,7 @@ public SnapshotUpdate withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -101,7 +101,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the SnapshotUpdate object itself.
@@ -112,7 +112,7 @@ public SnapshotUpdate withEncryptionSettings(EncryptionSettings encryptionSettin
     }
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -121,7 +121,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the SnapshotUpdate object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
index d75a766895de..5c91e3218ec0 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
@@ -22,7 +22,7 @@ public class SourceVault {
     private String id;
 
     /**
-     * Get the id value.
+     * Get resource Id.
      *
      * @return the id value
      */
@@ -31,7 +31,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set resource Id.
      *
      * @param id the id value to set
      * @return the SourceVault object itself.
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java
index 495a8e5b9ece..08086adbdf0f 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java
@@ -22,6 +22,9 @@ public final class StorageAccountTypes extends ExpandableStringEnum<StorageAccou
     /** Static value Premium_LRS for StorageAccountTypes. */
     public static final StorageAccountTypes PREMIUM_LRS = fromString("Premium_LRS");
 
+    /** Static value StandardSSD_LRS for StorageAccountTypes. */
+    public static final StorageAccountTypes STANDARD_SSD_LRS = fromString("StandardSSD_LRS");
+
     /**
      * Creates or finds a StorageAccountTypes from its string representation.
      * @param name a name to look for
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
index b58a3aee470a..6c4de56561a0 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
@@ -21,7 +21,7 @@ public class AccessUriInner {
     private String accessSAS;
 
     /**
-     * Get the accessSAS value.
+     * Get a SAS uri for accessing a disk.
      *
      * @return the accessSAS value
      */
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java
index b8252cad231d..f285a0688397 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java
@@ -83,7 +83,7 @@ public class DiskInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the managedBy value.
+     * Get a relative URI containing the ID of the VM that has the disk attached.
      *
      * @return the managedBy value
      */
@@ -112,7 +112,7 @@ public DiskInner withSku(DiskSku sku) {
     }
 
     /**
-     * Get the zones value.
+     * Get the Logical zone list for Disk.
      *
      * @return the zones value
      */
@@ -121,7 +121,7 @@ public List<String> zones() {
     }
 
     /**
-     * Set the zones value.
+     * Set the Logical zone list for Disk.
      *
      * @param zones the zones value to set
      * @return the DiskInner object itself.
@@ -132,7 +132,7 @@ public DiskInner withZones(List<String> zones) {
     }
 
     /**
-     * Get the timeCreated value.
+     * Get the time when the disk was created.
      *
      * @return the timeCreated value
      */
@@ -141,7 +141,7 @@ public DateTime timeCreated() {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -150,7 +150,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the DiskInner object itself.
@@ -161,7 +161,7 @@ public DiskInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the creationData value.
+     * Get disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @return the creationData value
      */
@@ -170,7 +170,7 @@ public CreationData creationData() {
     }
 
     /**
-     * Set the creationData value.
+     * Set disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @param creationData the creationData value to set
      * @return the DiskInner object itself.
@@ -181,7 +181,7 @@ public DiskInner withCreationData(CreationData creationData) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -190,7 +190,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the DiskInner object itself.
@@ -201,7 +201,7 @@ public DiskInner withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -210,7 +210,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the DiskInner object itself.
@@ -221,7 +221,7 @@ public DiskInner withEncryptionSettings(EncryptionSettings encryptionSettings) {
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the disk provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java
index 572638ea16d6..f2c3f31f7b07 100644
--- a/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java
+++ b/compute/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java
@@ -76,7 +76,7 @@ public class SnapshotInner extends Resource {
     private String provisioningState;
 
     /**
-     * Get the managedBy value.
+     * Get unused. Always Null.
      *
      * @return the managedBy value
      */
@@ -105,7 +105,7 @@ public SnapshotInner withSku(SnapshotSku sku) {
     }
 
     /**
-     * Get the timeCreated value.
+     * Get the time when the disk was created.
      *
      * @return the timeCreated value
      */
@@ -114,7 +114,7 @@ public DateTime timeCreated() {
     }
 
     /**
-     * Get the osType value.
+     * Get the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @return the osType value
      */
@@ -123,7 +123,7 @@ public OperatingSystemTypes osType() {
     }
 
     /**
-     * Set the osType value.
+     * Set the Operating System type. Possible values include: 'Windows', 'Linux'.
      *
      * @param osType the osType value to set
      * @return the SnapshotInner object itself.
@@ -134,7 +134,7 @@ public SnapshotInner withOsType(OperatingSystemTypes osType) {
     }
 
     /**
-     * Get the creationData value.
+     * Get disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @return the creationData value
      */
@@ -143,7 +143,7 @@ public CreationData creationData() {
     }
 
     /**
-     * Set the creationData value.
+     * Set disk source information. CreationData information cannot be changed after the disk has been created.
      *
      * @param creationData the creationData value to set
      * @return the SnapshotInner object itself.
@@ -154,7 +154,7 @@ public SnapshotInner withCreationData(CreationData creationData) {
     }
 
     /**
-     * Get the diskSizeGB value.
+     * Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @return the diskSizeGB value
      */
@@ -163,7 +163,7 @@ public Integer diskSizeGB() {
     }
 
     /**
-     * Set the diskSizeGB value.
+     * Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
      *
      * @param diskSizeGB the diskSizeGB value to set
      * @return the SnapshotInner object itself.
@@ -174,7 +174,7 @@ public SnapshotInner withDiskSizeGB(Integer diskSizeGB) {
     }
 
     /**
-     * Get the encryptionSettings value.
+     * Get encryption settings for disk or snapshot.
      *
      * @return the encryptionSettings value
      */
@@ -183,7 +183,7 @@ public EncryptionSettings encryptionSettings() {
     }
 
     /**
-     * Set the encryptionSettings value.
+     * Set encryption settings for disk or snapshot.
      *
      * @param encryptionSettings the encryptionSettings value to set
      * @return the SnapshotInner object itself.
@@ -194,7 +194,7 @@ public SnapshotInner withEncryptionSettings(EncryptionSettings encryptionSetting
     }
 
     /**
-     * Get the provisioningState value.
+     * Get the disk provisioning state.
      *
      * @return the provisioningState value
      */
diff --git a/dns/resource-manager/v2016_04_01/pom.xml b/dns/resource-manager/v2016_04_01/pom.xml
index 52376db2142c..5238e9a21ed9 100644
--- a/dns/resource-manager/v2016_04_01/pom.xml
+++ b/dns/resource-manager/v2016_04_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.dns.v2016_04_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-dns</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for DNS Management</name>
-    <description>This package contains Microsoft DNS Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.dns.v2016_04_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-network</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Network Management</name>
+    <description>This package contains Microsoft Network Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/ARecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/ARecord.java
index 92fdd9c58e6c..40aa356c73fa 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/ARecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/ARecord.java
@@ -21,7 +21,7 @@ public class ARecord {
     private String ipv4Address;
 
     /**
-     * Get the ipv4Address value.
+     * Get the IPv4 address of this A record.
      *
      * @return the ipv4Address value
      */
@@ -30,7 +30,7 @@ public String ipv4Address() {
     }
 
     /**
-     * Set the ipv4Address value.
+     * Set the IPv4 address of this A record.
      *
      * @param ipv4Address the ipv4Address value to set
      * @return the ARecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AaaaRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AaaaRecord.java
index 9df695cbbc37..90f24a4309e7 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AaaaRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AaaaRecord.java
@@ -21,7 +21,7 @@ public class AaaaRecord {
     private String ipv6Address;
 
     /**
-     * Get the ipv6Address value.
+     * Get the IPv6 address of this AAAA record.
      *
      * @return the ipv6Address value
      */
@@ -30,7 +30,7 @@ public String ipv6Address() {
     }
 
     /**
-     * Set the ipv6Address value.
+     * Set the IPv6 address of this AAAA record.
      *
      * @param ipv6Address the ipv6Address value to set
      * @return the AaaaRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AzureEntityResource.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AzureEntityResource.java
new file mode 100644
index 000000000000..2b0095ede8e2
--- /dev/null
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/AzureEntityResource.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.dns.v2016_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The resource model definition for a Azure Resource Manager resource with an
+ * etag.
+ */
+public class AzureEntityResource extends ProxyResource {
+    /**
+     * Resource Etag.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get resource Etag.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/CnameRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/CnameRecord.java
index 59f83785ca0f..ffb4c245d1b6 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/CnameRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/CnameRecord.java
@@ -21,7 +21,7 @@ public class CnameRecord {
     private String cname;
 
     /**
-     * Get the cname value.
+     * Get the canonical name for this CNAME record.
      *
      * @return the cname value
      */
@@ -30,7 +30,7 @@ public String cname() {
     }
 
     /**
-     * Set the cname value.
+     * Set the canonical name for this CNAME record.
      *
      * @param cname the cname value to set
      * @return the CnameRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/MxRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/MxRecord.java
index 98a820ce5688..50236a7b6e49 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/MxRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/MxRecord.java
@@ -27,7 +27,7 @@ public class MxRecord {
     private String exchange;
 
     /**
-     * Get the preference value.
+     * Get the preference value for this MX record.
      *
      * @return the preference value
      */
@@ -36,7 +36,7 @@ public Integer preference() {
     }
 
     /**
-     * Set the preference value.
+     * Set the preference value for this MX record.
      *
      * @param preference the preference value to set
      * @return the MxRecord object itself.
@@ -47,7 +47,7 @@ public MxRecord withPreference(Integer preference) {
     }
 
     /**
-     * Get the exchange value.
+     * Get the domain name of the mail host for this MX record.
      *
      * @return the exchange value
      */
@@ -56,7 +56,7 @@ public String exchange() {
     }
 
     /**
-     * Set the exchange value.
+     * Set the domain name of the mail host for this MX record.
      *
      * @param exchange the exchange value to set
      * @return the MxRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/NsRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/NsRecord.java
index 354b7c0845e5..77c4dab13197 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/NsRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/NsRecord.java
@@ -21,7 +21,7 @@ public class NsRecord {
     private String nsdname;
 
     /**
-     * Get the nsdname value.
+     * Get the name server name for this NS record.
      *
      * @return the nsdname value
      */
@@ -30,7 +30,7 @@ public String nsdname() {
     }
 
     /**
-     * Set the nsdname value.
+     * Set the name server name for this NS record.
      *
      * @param nsdname the nsdname value to set
      * @return the NsRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/PtrRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/PtrRecord.java
index 072292fe934d..2e84f680fbcd 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/PtrRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/PtrRecord.java
@@ -21,7 +21,7 @@ public class PtrRecord {
     private String ptrdname;
 
     /**
-     * Get the ptrdname value.
+     * Get the PTR target domain name for this PTR record.
      *
      * @return the ptrdname value
      */
@@ -30,7 +30,7 @@ public String ptrdname() {
     }
 
     /**
-     * Set the ptrdname value.
+     * Set the PTR target domain name for this PTR record.
      *
      * @param ptrdname the ptrdname value to set
      * @return the PtrRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSetUpdateParameters.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSetUpdateParameters.java
index 6ac971b78039..806ef2b989cb 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSetUpdateParameters.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSetUpdateParameters.java
@@ -22,7 +22,7 @@ public class RecordSetUpdateParameters {
     private RecordSetInner recordSet;
 
     /**
-     * Get the recordSet value.
+     * Get specifies information about the record set being updated.
      *
      * @return the recordSet value
      */
@@ -31,7 +31,7 @@ public RecordSetInner recordSet() {
     }
 
     /**
-     * Set the recordSet value.
+     * Set specifies information about the record set being updated.
      *
      * @param recordSet the recordSet value to set
      * @return the RecordSetUpdateParameters object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSets.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSets.java
index 8a0e38a0dea5..a16493901dcb 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSets.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/RecordSets.java
@@ -21,7 +21,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -31,7 +31,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -44,7 +44,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -57,7 +57,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -69,7 +69,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -81,7 +81,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SoaRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SoaRecord.java
index 8d8755932944..25cdc8914a00 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SoaRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SoaRecord.java
@@ -58,7 +58,7 @@ public class SoaRecord {
     private Long minimumTtl;
 
     /**
-     * Get the host value.
+     * Get the domain name of the authoritative name server for this SOA record.
      *
      * @return the host value
      */
@@ -67,7 +67,7 @@ public String host() {
     }
 
     /**
-     * Set the host value.
+     * Set the domain name of the authoritative name server for this SOA record.
      *
      * @param host the host value to set
      * @return the SoaRecord object itself.
@@ -78,7 +78,7 @@ public SoaRecord withHost(String host) {
     }
 
     /**
-     * Get the email value.
+     * Get the email contact for this SOA record.
      *
      * @return the email value
      */
@@ -87,7 +87,7 @@ public String email() {
     }
 
     /**
-     * Set the email value.
+     * Set the email contact for this SOA record.
      *
      * @param email the email value to set
      * @return the SoaRecord object itself.
@@ -98,7 +98,7 @@ public SoaRecord withEmail(String email) {
     }
 
     /**
-     * Get the serialNumber value.
+     * Get the serial number for this SOA record.
      *
      * @return the serialNumber value
      */
@@ -107,7 +107,7 @@ public Long serialNumber() {
     }
 
     /**
-     * Set the serialNumber value.
+     * Set the serial number for this SOA record.
      *
      * @param serialNumber the serialNumber value to set
      * @return the SoaRecord object itself.
@@ -118,7 +118,7 @@ public SoaRecord withSerialNumber(Long serialNumber) {
     }
 
     /**
-     * Get the refreshTime value.
+     * Get the refresh value for this SOA record.
      *
      * @return the refreshTime value
      */
@@ -127,7 +127,7 @@ public Long refreshTime() {
     }
 
     /**
-     * Set the refreshTime value.
+     * Set the refresh value for this SOA record.
      *
      * @param refreshTime the refreshTime value to set
      * @return the SoaRecord object itself.
@@ -138,7 +138,7 @@ public SoaRecord withRefreshTime(Long refreshTime) {
     }
 
     /**
-     * Get the retryTime value.
+     * Get the retry time for this SOA record.
      *
      * @return the retryTime value
      */
@@ -147,7 +147,7 @@ public Long retryTime() {
     }
 
     /**
-     * Set the retryTime value.
+     * Set the retry time for this SOA record.
      *
      * @param retryTime the retryTime value to set
      * @return the SoaRecord object itself.
@@ -158,7 +158,7 @@ public SoaRecord withRetryTime(Long retryTime) {
     }
 
     /**
-     * Get the expireTime value.
+     * Get the expire time for this SOA record.
      *
      * @return the expireTime value
      */
@@ -167,7 +167,7 @@ public Long expireTime() {
     }
 
     /**
-     * Set the expireTime value.
+     * Set the expire time for this SOA record.
      *
      * @param expireTime the expireTime value to set
      * @return the SoaRecord object itself.
@@ -178,7 +178,7 @@ public SoaRecord withExpireTime(Long expireTime) {
     }
 
     /**
-     * Get the minimumTtl value.
+     * Get the minimum value for this SOA record. By convention this is used to determine the negative caching duration.
      *
      * @return the minimumTtl value
      */
@@ -187,7 +187,7 @@ public Long minimumTtl() {
     }
 
     /**
-     * Set the minimumTtl value.
+     * Set the minimum value for this SOA record. By convention this is used to determine the negative caching duration.
      *
      * @param minimumTtl the minimumTtl value to set
      * @return the SoaRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SrvRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SrvRecord.java
index 6aa63b6ba726..2f8377f1da06 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SrvRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/SrvRecord.java
@@ -39,7 +39,7 @@ public class SrvRecord {
     private String target;
 
     /**
-     * Get the priority value.
+     * Get the priority value for this SRV record.
      *
      * @return the priority value
      */
@@ -48,7 +48,7 @@ public Integer priority() {
     }
 
     /**
-     * Set the priority value.
+     * Set the priority value for this SRV record.
      *
      * @param priority the priority value to set
      * @return the SrvRecord object itself.
@@ -59,7 +59,7 @@ public SrvRecord withPriority(Integer priority) {
     }
 
     /**
-     * Get the weight value.
+     * Get the weight value for this SRV record.
      *
      * @return the weight value
      */
@@ -68,7 +68,7 @@ public Integer weight() {
     }
 
     /**
-     * Set the weight value.
+     * Set the weight value for this SRV record.
      *
      * @param weight the weight value to set
      * @return the SrvRecord object itself.
@@ -79,7 +79,7 @@ public SrvRecord withWeight(Integer weight) {
     }
 
     /**
-     * Get the port value.
+     * Get the port value for this SRV record.
      *
      * @return the port value
      */
@@ -88,7 +88,7 @@ public Integer port() {
     }
 
     /**
-     * Set the port value.
+     * Set the port value for this SRV record.
      *
      * @param port the port value to set
      * @return the SrvRecord object itself.
@@ -99,7 +99,7 @@ public SrvRecord withPort(Integer port) {
     }
 
     /**
-     * Get the target value.
+     * Get the target domain name for this SRV record.
      *
      * @return the target value
      */
@@ -108,7 +108,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target domain name for this SRV record.
      *
      * @param target the target value to set
      * @return the SrvRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/TxtRecord.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/TxtRecord.java
index db193531730f..01e9500eb8b0 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/TxtRecord.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/TxtRecord.java
@@ -22,7 +22,7 @@ public class TxtRecord {
     private List<String> value;
 
     /**
-     * Get the value value.
+     * Get the text value of this TXT record.
      *
      * @return the value value
      */
@@ -31,7 +31,7 @@ public List<String> value() {
     }
 
     /**
-     * Set the value value.
+     * Set the text value of this TXT record.
      *
      * @param value the value value to set
      * @return the TxtRecord object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/Zone.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/Zone.java
index 290c586322d0..21d101e96d9b 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/Zone.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/Zone.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.dns.v2016_04_01.implementation.NetworkManager;
 import java.util.List;
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/DnsManagementClientImpl.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/DnsManagementClientImpl.java
index 081bc0caefa2..50569d65c0a8 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/DnsManagementClientImpl.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/DnsManagementClientImpl.java
@@ -28,11 +28,11 @@ public AzureClient getAzureClient() {
         return this.azureClient;
     }
 
-    /** Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription. */
+    /** The ID of the target subscription. */
     private String subscriptionId;
 
     /**
-     * Gets Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription.
+     * Gets The ID of the target subscription.
      *
      * @return the subscriptionId value.
      */
@@ -41,7 +41,7 @@ public String subscriptionId() {
     }
 
     /**
-     * Sets Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription.
+     * Sets The ID of the target subscription.
      *
      * @param subscriptionId the subscriptionId value.
      * @return the service client itself
@@ -51,11 +51,11 @@ public DnsManagementClientImpl withSubscriptionId(String subscriptionId) {
         return this;
     }
 
-    /** Specifies the API version. */
+    /** The API version to use for this operation. */
     private String apiVersion;
 
     /**
-     * Gets Specifies the API version.
+     * Gets The API version to use for this operation.
      *
      * @return the apiVersion value.
      */
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetInner.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetInner.java
index 9c957cdeb46e..1853a83cf0cb 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetInner.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetInner.java
@@ -119,7 +119,7 @@ public class RecordSetInner {
     private SoaRecord soaRecord;
 
     /**
-     * Get the id value.
+     * Get the ID of the record set.
      *
      * @return the id value
      */
@@ -128,7 +128,7 @@ public String id() {
     }
 
     /**
-     * Set the id value.
+     * Set the ID of the record set.
      *
      * @param id the id value to set
      * @return the RecordSetInner object itself.
@@ -139,7 +139,7 @@ public RecordSetInner withId(String id) {
     }
 
     /**
-     * Get the name value.
+     * Get the name of the record set.
      *
      * @return the name value
      */
@@ -148,7 +148,7 @@ public String name() {
     }
 
     /**
-     * Set the name value.
+     * Set the name of the record set.
      *
      * @param name the name value to set
      * @return the RecordSetInner object itself.
@@ -159,7 +159,7 @@ public RecordSetInner withName(String name) {
     }
 
     /**
-     * Get the type value.
+     * Get the type of the record set.
      *
      * @return the type value
      */
@@ -168,7 +168,7 @@ public String type() {
     }
 
     /**
-     * Set the type value.
+     * Set the type of the record set.
      *
      * @param type the type value to set
      * @return the RecordSetInner object itself.
@@ -179,7 +179,7 @@ public RecordSetInner withType(String type) {
     }
 
     /**
-     * Get the etag value.
+     * Get the etag of the record set.
      *
      * @return the etag value
      */
@@ -188,7 +188,7 @@ public String etag() {
     }
 
     /**
-     * Set the etag value.
+     * Set the etag of the record set.
      *
      * @param etag the etag value to set
      * @return the RecordSetInner object itself.
@@ -199,7 +199,7 @@ public RecordSetInner withEtag(String etag) {
     }
 
     /**
-     * Get the metadata value.
+     * Get the metadata attached to the record set.
      *
      * @return the metadata value
      */
@@ -208,7 +208,7 @@ public Map<String, String> metadata() {
     }
 
     /**
-     * Set the metadata value.
+     * Set the metadata attached to the record set.
      *
      * @param metadata the metadata value to set
      * @return the RecordSetInner object itself.
@@ -219,7 +219,7 @@ public RecordSetInner withMetadata(Map<String, String> metadata) {
     }
 
     /**
-     * Get the tTL value.
+     * Get the TTL (time-to-live) of the records in the record set.
      *
      * @return the tTL value
      */
@@ -228,7 +228,7 @@ public Long tTL() {
     }
 
     /**
-     * Set the tTL value.
+     * Set the TTL (time-to-live) of the records in the record set.
      *
      * @param tTL the tTL value to set
      * @return the RecordSetInner object itself.
@@ -239,7 +239,7 @@ public RecordSetInner withTTL(Long tTL) {
     }
 
     /**
-     * Get the aRecords value.
+     * Get the list of A records in the record set.
      *
      * @return the aRecords value
      */
@@ -248,7 +248,7 @@ public List<ARecord> aRecords() {
     }
 
     /**
-     * Set the aRecords value.
+     * Set the list of A records in the record set.
      *
      * @param aRecords the aRecords value to set
      * @return the RecordSetInner object itself.
@@ -259,7 +259,7 @@ public RecordSetInner withARecords(List<ARecord> aRecords) {
     }
 
     /**
-     * Get the aaaaRecords value.
+     * Get the list of AAAA records in the record set.
      *
      * @return the aaaaRecords value
      */
@@ -268,7 +268,7 @@ public List<AaaaRecord> aaaaRecords() {
     }
 
     /**
-     * Set the aaaaRecords value.
+     * Set the list of AAAA records in the record set.
      *
      * @param aaaaRecords the aaaaRecords value to set
      * @return the RecordSetInner object itself.
@@ -279,7 +279,7 @@ public RecordSetInner withAaaaRecords(List<AaaaRecord> aaaaRecords) {
     }
 
     /**
-     * Get the mxRecords value.
+     * Get the list of MX records in the record set.
      *
      * @return the mxRecords value
      */
@@ -288,7 +288,7 @@ public List<MxRecord> mxRecords() {
     }
 
     /**
-     * Set the mxRecords value.
+     * Set the list of MX records in the record set.
      *
      * @param mxRecords the mxRecords value to set
      * @return the RecordSetInner object itself.
@@ -299,7 +299,7 @@ public RecordSetInner withMxRecords(List<MxRecord> mxRecords) {
     }
 
     /**
-     * Get the nsRecords value.
+     * Get the list of NS records in the record set.
      *
      * @return the nsRecords value
      */
@@ -308,7 +308,7 @@ public List<NsRecord> nsRecords() {
     }
 
     /**
-     * Set the nsRecords value.
+     * Set the list of NS records in the record set.
      *
      * @param nsRecords the nsRecords value to set
      * @return the RecordSetInner object itself.
@@ -319,7 +319,7 @@ public RecordSetInner withNsRecords(List<NsRecord> nsRecords) {
     }
 
     /**
-     * Get the ptrRecords value.
+     * Get the list of PTR records in the record set.
      *
      * @return the ptrRecords value
      */
@@ -328,7 +328,7 @@ public List<PtrRecord> ptrRecords() {
     }
 
     /**
-     * Set the ptrRecords value.
+     * Set the list of PTR records in the record set.
      *
      * @param ptrRecords the ptrRecords value to set
      * @return the RecordSetInner object itself.
@@ -339,7 +339,7 @@ public RecordSetInner withPtrRecords(List<PtrRecord> ptrRecords) {
     }
 
     /**
-     * Get the srvRecords value.
+     * Get the list of SRV records in the record set.
      *
      * @return the srvRecords value
      */
@@ -348,7 +348,7 @@ public List<SrvRecord> srvRecords() {
     }
 
     /**
-     * Set the srvRecords value.
+     * Set the list of SRV records in the record set.
      *
      * @param srvRecords the srvRecords value to set
      * @return the RecordSetInner object itself.
@@ -359,7 +359,7 @@ public RecordSetInner withSrvRecords(List<SrvRecord> srvRecords) {
     }
 
     /**
-     * Get the txtRecords value.
+     * Get the list of TXT records in the record set.
      *
      * @return the txtRecords value
      */
@@ -368,7 +368,7 @@ public List<TxtRecord> txtRecords() {
     }
 
     /**
-     * Set the txtRecords value.
+     * Set the list of TXT records in the record set.
      *
      * @param txtRecords the txtRecords value to set
      * @return the RecordSetInner object itself.
@@ -379,7 +379,7 @@ public RecordSetInner withTxtRecords(List<TxtRecord> txtRecords) {
     }
 
     /**
-     * Get the cnameRecord value.
+     * Get the CNAME record in the  record set.
      *
      * @return the cnameRecord value
      */
@@ -388,7 +388,7 @@ public CnameRecord cnameRecord() {
     }
 
     /**
-     * Set the cnameRecord value.
+     * Set the CNAME record in the  record set.
      *
      * @param cnameRecord the cnameRecord value to set
      * @return the RecordSetInner object itself.
@@ -399,7 +399,7 @@ public RecordSetInner withCnameRecord(CnameRecord cnameRecord) {
     }
 
     /**
-     * Get the soaRecord value.
+     * Get the SOA record in the record set.
      *
      * @return the soaRecord value
      */
@@ -408,7 +408,7 @@ public SoaRecord soaRecord() {
     }
 
     /**
-     * Set the soaRecord value.
+     * Set the SOA record in the record set.
      *
      * @param soaRecord the soaRecord value to set
      * @return the RecordSetInner object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsImpl.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsImpl.java
index a33d71b14240..883f625559ad 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsImpl.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsImpl.java
@@ -103,7 +103,8 @@ public Observable<RecordSet> listByTypeAsync(final String resourceGroupName, fin
             public Iterable<RecordSetInner> call(Page<RecordSetInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RecordSetInner, RecordSet>() {
+        })
+        .map(new Func1<RecordSetInner, RecordSet>() {
             @Override
             public RecordSet call(RecordSetInner inner) {
                 return new RecordSetImpl(inner, manager());
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsInner.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsInner.java
index aea9978be37e..088189767eb9 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsInner.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/RecordSetsInner.java
@@ -100,7 +100,7 @@ interface RecordSetsService {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -117,7 +117,7 @@ public RecordSetInner update(String resourceGroupName, String zoneName, String r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -133,7 +133,7 @@ public ServiceFuture<RecordSetInner> updateAsync(String resourceGroupName, Strin
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -153,7 +153,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -202,7 +202,7 @@ public Observable<ServiceResponse<RecordSetInner>> call(Response<ResponseBody> r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -220,7 +220,7 @@ public RecordSetInner update(String resourceGroupName, String zoneName, String r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -237,7 +237,7 @@ public ServiceFuture<RecordSetInner> updateAsync(String resourceGroupName, Strin
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -258,7 +258,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -314,7 +314,7 @@ private ServiceResponse<RecordSetInner> updateDelegate(Response<ResponseBody> re
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -331,7 +331,7 @@ public RecordSetInner createOrUpdate(String resourceGroupName, String zoneName,
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -347,7 +347,7 @@ public ServiceFuture<RecordSetInner> createOrUpdateAsync(String resourceGroupNam
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -367,7 +367,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -417,7 +417,7 @@ public Observable<ServiceResponse<RecordSetInner>> call(Response<ResponseBody> r
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -436,7 +436,7 @@ public RecordSetInner createOrUpdate(String resourceGroupName, String zoneName,
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -454,7 +454,7 @@ public ServiceFuture<RecordSetInner> createOrUpdateAsync(String resourceGroupNam
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -476,7 +476,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -534,7 +534,7 @@ private ServiceResponse<RecordSetInner> createOrUpdateDelegate(Response<Response
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -549,7 +549,7 @@ public void delete(String resourceGroupName, String zoneName, String relativeRec
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -564,7 +564,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -583,7 +583,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -627,7 +627,7 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -643,7 +643,7 @@ public void delete(String resourceGroupName, String zoneName, String relativeRec
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -659,7 +659,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -679,7 +679,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -731,7 +731,7 @@ private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) th
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -747,7 +747,7 @@ public RecordSetInner get(String resourceGroupName, String zoneName, String rela
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -762,7 +762,7 @@ public ServiceFuture<RecordSetInner> getAsync(String resourceGroupName, String z
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -781,7 +781,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -831,7 +831,7 @@ private ServiceResponse<RecordSetInner> getDelegate(Response<ResponseBody> respo
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -852,7 +852,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -874,7 +874,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -893,7 +893,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -916,7 +916,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -957,7 +957,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(Response<ResponseB
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -980,7 +980,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1004,7 +1004,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1025,7 +1025,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1050,7 +1050,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<RecordSetInner>> * @param zoneName The name of the DNS zone (without a terminating dot).
     ServiceResponse<PageImpl<RecordSetInner>> * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
     ServiceResponse<PageImpl<RecordSetInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1098,7 +1098,7 @@ private ServiceResponse<PageImpl<RecordSetInner>> listByTypeDelegate(Response<Re
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -1118,7 +1118,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1139,7 +1139,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1157,7 +1157,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1179,7 +1179,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecordSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
@@ -1216,7 +1216,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(Response<ResponseB
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1238,7 +1238,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1261,7 +1261,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1281,7 +1281,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1305,7 +1305,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<RecordSetInner>> * @param zoneName The name of the DNS zone (without a terminating dot).
     ServiceResponse<PageImpl<RecordSetInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
     ServiceResponse<PageImpl<RecordSetInner>> * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneDeleteResultInner.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneDeleteResultInner.java
index cc0ee96adf25..d77b6c6ad604 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneDeleteResultInner.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneDeleteResultInner.java
@@ -54,7 +54,7 @@ public class ZoneDeleteResultInner {
     private String requestId;
 
     /**
-     * Get the azureAsyncOperation value.
+     * Get users can perform a Get on Azure-AsyncOperation to get the status of their delete Zone operations.
      *
      * @return the azureAsyncOperation value
      */
@@ -63,7 +63,7 @@ public String azureAsyncOperation() {
     }
 
     /**
-     * Set the azureAsyncOperation value.
+     * Set users can perform a Get on Azure-AsyncOperation to get the status of their delete Zone operations.
      *
      * @param azureAsyncOperation the azureAsyncOperation value to set
      * @return the ZoneDeleteResultInner object itself.
@@ -74,7 +74,7 @@ public ZoneDeleteResultInner withAzureAsyncOperation(String azureAsyncOperation)
     }
 
     /**
-     * Get the status value.
+     * Get possible values include: 'InProgress', 'Succeeded', 'Failed'.
      *
      * @return the status value
      */
@@ -83,7 +83,7 @@ public OperationStatus status() {
     }
 
     /**
-     * Set the status value.
+     * Set possible values include: 'InProgress', 'Succeeded', 'Failed'.
      *
      * @param status the status value to set
      * @return the ZoneDeleteResultInner object itself.
@@ -94,7 +94,7 @@ public ZoneDeleteResultInner withStatus(OperationStatus status) {
     }
 
     /**
-     * Get the statusCode value.
+     * Get possible values include: 'Continue', 'SwitchingProtocols', 'OK', 'Created', 'Accepted', 'NonAuthoritativeInformation', 'NoContent', 'ResetContent', 'PartialContent', 'MultipleChoices', 'Ambiguous', 'MovedPermanently', 'Moved', 'Found', 'Redirect', 'SeeOther', 'RedirectMethod', 'NotModified', 'UseProxy', 'Unused', 'TemporaryRedirect', 'RedirectKeepVerb', 'BadRequest', 'Unauthorized', 'PaymentRequired', 'Forbidden', 'NotFound', 'MethodNotAllowed', 'NotAcceptable', 'ProxyAuthenticationRequired', 'RequestTimeout', 'Conflict', 'Gone', 'LengthRequired', 'PreconditionFailed', 'RequestEntityTooLarge', 'RequestUriTooLong', 'UnsupportedMediaType', 'RequestedRangeNotSatisfiable', 'ExpectationFailed', 'UpgradeRequired', 'InternalServerError', 'NotImplemented', 'BadGateway', 'ServiceUnavailable', 'GatewayTimeout', 'HttpVersionNotSupported'.
      *
      * @return the statusCode value
      */
@@ -103,7 +103,7 @@ public HttpStatusCode statusCode() {
     }
 
     /**
-     * Set the statusCode value.
+     * Set possible values include: 'Continue', 'SwitchingProtocols', 'OK', 'Created', 'Accepted', 'NonAuthoritativeInformation', 'NoContent', 'ResetContent', 'PartialContent', 'MultipleChoices', 'Ambiguous', 'MovedPermanently', 'Moved', 'Found', 'Redirect', 'SeeOther', 'RedirectMethod', 'NotModified', 'UseProxy', 'Unused', 'TemporaryRedirect', 'RedirectKeepVerb', 'BadRequest', 'Unauthorized', 'PaymentRequired', 'Forbidden', 'NotFound', 'MethodNotAllowed', 'NotAcceptable', 'ProxyAuthenticationRequired', 'RequestTimeout', 'Conflict', 'Gone', 'LengthRequired', 'PreconditionFailed', 'RequestEntityTooLarge', 'RequestUriTooLong', 'UnsupportedMediaType', 'RequestedRangeNotSatisfiable', 'ExpectationFailed', 'UpgradeRequired', 'InternalServerError', 'NotImplemented', 'BadGateway', 'ServiceUnavailable', 'GatewayTimeout', 'HttpVersionNotSupported'.
      *
      * @param statusCode the statusCode value to set
      * @return the ZoneDeleteResultInner object itself.
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneInner.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneInner.java
index bfe938db1660..80125c7c8014 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneInner.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZoneInner.java
@@ -47,7 +47,7 @@ public class ZoneInner extends Resource {
     private List<String> nameServers;
 
     /**
-     * Get the etag value.
+     * Get the etag of the zone.
      *
      * @return the etag value
      */
@@ -56,7 +56,7 @@ public String etag() {
     }
 
     /**
-     * Set the etag value.
+     * Set the etag of the zone.
      *
      * @param etag the etag value to set
      * @return the ZoneInner object itself.
@@ -67,7 +67,7 @@ public ZoneInner withEtag(String etag) {
     }
 
     /**
-     * Get the maxNumberOfRecordSets value.
+     * Get the maximum number of record sets that can be created in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the maxNumberOfRecordSets value
      */
@@ -76,7 +76,7 @@ public Long maxNumberOfRecordSets() {
     }
 
     /**
-     * Set the maxNumberOfRecordSets value.
+     * Set the maximum number of record sets that can be created in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @param maxNumberOfRecordSets the maxNumberOfRecordSets value to set
      * @return the ZoneInner object itself.
@@ -87,7 +87,7 @@ public ZoneInner withMaxNumberOfRecordSets(Long maxNumberOfRecordSets) {
     }
 
     /**
-     * Get the numberOfRecordSets value.
+     * Get the current number of record sets in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the numberOfRecordSets value
      */
@@ -96,7 +96,7 @@ public Long numberOfRecordSets() {
     }
 
     /**
-     * Set the numberOfRecordSets value.
+     * Set the current number of record sets in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @param numberOfRecordSets the numberOfRecordSets value to set
      * @return the ZoneInner object itself.
@@ -107,7 +107,7 @@ public ZoneInner withNumberOfRecordSets(Long numberOfRecordSets) {
     }
 
     /**
-     * Get the nameServers value.
+     * Get the name servers for this DNS zone. This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the nameServers value
      */
diff --git a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZonesInner.java b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZonesInner.java
index ec1cc11fb140..841345db72d0 100644
--- a/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZonesInner.java
+++ b/dns/resource-manager/v2016_04_01/src/main/java/com/microsoft/azure/management/dns/v2016_04_01/implementation/ZonesInner.java
@@ -101,7 +101,7 @@ interface ZonesService {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -116,7 +116,7 @@ public ZoneInner createOrUpdate(String resourceGroupName, String zoneName, ZoneI
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -130,7 +130,7 @@ public ServiceFuture<ZoneInner> createOrUpdateAsync(String resourceGroupName, St
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -148,7 +148,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -190,7 +190,7 @@ public Observable<ServiceResponse<ZoneInner>> call(Response<ResponseBody> respon
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -207,7 +207,7 @@ public ZoneInner createOrUpdate(String resourceGroupName, String zoneName, ZoneI
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -223,7 +223,7 @@ public ServiceFuture<ZoneInner> createOrUpdateAsync(String resourceGroupName, St
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -243,7 +243,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -293,7 +293,7 @@ private ServiceResponse<ZoneInner> createOrUpdateDelegate(Response<ResponseBody>
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -307,7 +307,7 @@ public ZoneDeleteResultInner delete(String resourceGroupName, String zoneName) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -320,7 +320,7 @@ public ServiceFuture<ZoneDeleteResultInner> deleteAsync(String resourceGroupName
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -337,7 +337,7 @@ public ZoneDeleteResultInner call(ServiceResponse<ZoneDeleteResultInner> respons
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -362,7 +362,7 @@ public Observable<ServiceResponse<ZoneDeleteResultInner>> deleteWithServiceRespo
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -377,7 +377,7 @@ public ZoneDeleteResultInner delete(String resourceGroupName, String zoneName, S
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -391,7 +391,7 @@ public ServiceFuture<ZoneDeleteResultInner> deleteAsync(String resourceGroupName
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -409,7 +409,7 @@ public ZoneDeleteResultInner call(ServiceResponse<ZoneDeleteResultInner> respons
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -435,7 +435,7 @@ public Observable<ServiceResponse<ZoneDeleteResultInner>> deleteWithServiceRespo
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -449,7 +449,7 @@ public ZoneDeleteResultInner beginDelete(String resourceGroupName, String zoneNa
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -462,7 +462,7 @@ public ServiceFuture<ZoneDeleteResultInner> beginDeleteAsync(String resourceGrou
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneDeleteResultInner object
@@ -479,7 +479,7 @@ public ZoneDeleteResultInner call(ServiceResponse<ZoneDeleteResultInner> respons
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneDeleteResultInner object
@@ -515,7 +515,7 @@ public Observable<ServiceResponse<ZoneDeleteResultInner>> call(Response<Response
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -530,7 +530,7 @@ public ZoneDeleteResultInner beginDelete(String resourceGroupName, String zoneNa
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -544,7 +544,7 @@ public ServiceFuture<ZoneDeleteResultInner> beginDeleteAsync(String resourceGrou
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -562,7 +562,7 @@ public ZoneDeleteResultInner call(ServiceResponse<ZoneDeleteResultInner> respons
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -607,7 +607,7 @@ private ServiceResponse<ZoneDeleteResultInner> beginDeleteDelegate(Response<Resp
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -621,7 +621,7 @@ public ZoneInner getByResourceGroup(String resourceGroupName, String zoneName) {
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -634,7 +634,7 @@ public ServiceFuture<ZoneInner> getByResourceGroupAsync(String resourceGroupName
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -651,7 +651,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -693,7 +693,7 @@ private ServiceResponse<ZoneInner> getByResourceGroupDelegate(Response<ResponseB
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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
@@ -712,7 +712,7 @@ public Page<ZoneInner> nextPage(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -732,7 +732,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
      */
@@ -749,7 +749,7 @@ public Page<ZoneInner> call(ServiceResponse<Page<ZoneInner>> response) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
      */
@@ -770,7 +770,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(ServiceResponse<Page<Zo
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ZoneInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -802,7 +802,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(Response<ResponseBody>
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -822,7 +822,7 @@ public Page<ZoneInner> nextPage(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -843,7 +843,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
@@ -861,7 +861,7 @@ public Page<ZoneInner> call(ServiceResponse<Page<ZoneInner>> response) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
@@ -883,7 +883,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(ServiceResponse<Page<Zo
     /**
      * Lists the DNS zones within a resource group.
      *
-    ServiceResponse<PageImpl<ZoneInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ZoneInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<ZoneInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ZoneInner&gt; object wrapped in {@link ServiceResponse} if successful.
diff --git a/dns/resource-manager/v2017_10_01/pom.xml b/dns/resource-manager/v2017_10_01/pom.xml
index d0ac6a2bb135..a41da43759b1 100644
--- a/dns/resource-manager/v2017_10_01/pom.xml
+++ b/dns/resource-manager/v2017_10_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.dns.v2017_10_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-network</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Network Management</name>
-    <description>This package contains Microsoft Network Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.dns.v2017_10_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-network</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Network Management</name>
+    <description>This package contains Microsoft Network Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ARecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ARecord.java
index 99621fea8651..66a9a3932027 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ARecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ARecord.java
@@ -21,7 +21,7 @@ public class ARecord {
     private String ipv4Address;
 
     /**
-     * Get the ipv4Address value.
+     * Get the IPv4 address of this A record.
      *
      * @return the ipv4Address value
      */
@@ -30,7 +30,7 @@ public String ipv4Address() {
     }
 
     /**
-     * Set the ipv4Address value.
+     * Set the IPv4 address of this A record.
      *
      * @param ipv4Address the ipv4Address value to set
      * @return the ARecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AaaaRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AaaaRecord.java
index e68a64c4286c..b078ae472d1d 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AaaaRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AaaaRecord.java
@@ -21,7 +21,7 @@ public class AaaaRecord {
     private String ipv6Address;
 
     /**
-     * Get the ipv6Address value.
+     * Get the IPv6 address of this AAAA record.
      *
      * @return the ipv6Address value
      */
@@ -30,7 +30,7 @@ public String ipv6Address() {
     }
 
     /**
-     * Set the ipv6Address value.
+     * Set the IPv6 address of this AAAA record.
      *
      * @param ipv6Address the ipv6Address value to set
      * @return the AaaaRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AzureEntityResource.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AzureEntityResource.java
new file mode 100644
index 000000000000..ee64c2c37f55
--- /dev/null
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/AzureEntityResource.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.dns.v2017_10_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The resource model definition for a Azure Resource Manager resource with an
+ * etag.
+ */
+public class AzureEntityResource extends ProxyResource {
+    /**
+     * Resource Etag.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get resource Etag.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CaaRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CaaRecord.java
index e10b684a340e..dead87beb6c2 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CaaRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CaaRecord.java
@@ -33,7 +33,7 @@ public class CaaRecord {
     private String value;
 
     /**
-     * Get the flags value.
+     * Get the flags for this CAA record as an integer between 0 and 255.
      *
      * @return the flags value
      */
@@ -42,7 +42,7 @@ public Integer flags() {
     }
 
     /**
-     * Set the flags value.
+     * Set the flags for this CAA record as an integer between 0 and 255.
      *
      * @param flags the flags value to set
      * @return the CaaRecord object itself.
@@ -53,7 +53,7 @@ public CaaRecord withFlags(Integer flags) {
     }
 
     /**
-     * Get the tag value.
+     * Get the tag for this CAA record.
      *
      * @return the tag value
      */
@@ -62,7 +62,7 @@ public String tag() {
     }
 
     /**
-     * Set the tag value.
+     * Set the tag for this CAA record.
      *
      * @param tag the tag value to set
      * @return the CaaRecord object itself.
@@ -73,7 +73,7 @@ public CaaRecord withTag(String tag) {
     }
 
     /**
-     * Get the value value.
+     * Get the value for this CAA record.
      *
      * @return the value value
      */
@@ -82,7 +82,7 @@ public String value() {
     }
 
     /**
-     * Set the value value.
+     * Set the value for this CAA record.
      *
      * @param value the value value to set
      * @return the CaaRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CnameRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CnameRecord.java
index 9f5bd65f5cba..7a365da58c87 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CnameRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/CnameRecord.java
@@ -21,7 +21,7 @@ public class CnameRecord {
     private String cname;
 
     /**
-     * Get the cname value.
+     * Get the canonical name for this CNAME record.
      *
      * @return the cname value
      */
@@ -30,7 +30,7 @@ public String cname() {
     }
 
     /**
-     * Set the cname value.
+     * Set the canonical name for this CNAME record.
      *
      * @param cname the cname value to set
      * @return the CnameRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/MxRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/MxRecord.java
index 2da543900157..91d27699b7d3 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/MxRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/MxRecord.java
@@ -27,7 +27,7 @@ public class MxRecord {
     private String exchange;
 
     /**
-     * Get the preference value.
+     * Get the preference value for this MX record.
      *
      * @return the preference value
      */
@@ -36,7 +36,7 @@ public Integer preference() {
     }
 
     /**
-     * Set the preference value.
+     * Set the preference value for this MX record.
      *
      * @param preference the preference value to set
      * @return the MxRecord object itself.
@@ -47,7 +47,7 @@ public MxRecord withPreference(Integer preference) {
     }
 
     /**
-     * Get the exchange value.
+     * Get the domain name of the mail host for this MX record.
      *
      * @return the exchange value
      */
@@ -56,7 +56,7 @@ public String exchange() {
     }
 
     /**
-     * Set the exchange value.
+     * Set the domain name of the mail host for this MX record.
      *
      * @param exchange the exchange value to set
      * @return the MxRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/NsRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/NsRecord.java
index 0018c8e0e22c..f89d401a19e2 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/NsRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/NsRecord.java
@@ -21,7 +21,7 @@ public class NsRecord {
     private String nsdname;
 
     /**
-     * Get the nsdname value.
+     * Get the name server name for this NS record.
      *
      * @return the nsdname value
      */
@@ -30,7 +30,7 @@ public String nsdname() {
     }
 
     /**
-     * Set the nsdname value.
+     * Set the name server name for this NS record.
      *
      * @param nsdname the nsdname value to set
      * @return the NsRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/PtrRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/PtrRecord.java
index bc96f418dcd2..f4c0e234e2f6 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/PtrRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/PtrRecord.java
@@ -21,7 +21,7 @@ public class PtrRecord {
     private String ptrdname;
 
     /**
-     * Get the ptrdname value.
+     * Get the PTR target domain name for this PTR record.
      *
      * @return the ptrdname value
      */
@@ -30,7 +30,7 @@ public String ptrdname() {
     }
 
     /**
-     * Set the ptrdname value.
+     * Set the PTR target domain name for this PTR record.
      *
      * @param ptrdname the ptrdname value to set
      * @return the PtrRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSetUpdateParameters.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSetUpdateParameters.java
index 89ce0efb0b80..5f5136098db7 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSetUpdateParameters.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSetUpdateParameters.java
@@ -22,7 +22,7 @@ public class RecordSetUpdateParameters {
     private RecordSetInner recordSet;
 
     /**
-     * Get the recordSet value.
+     * Get specifies information about the record set being updated.
      *
      * @return the recordSet value
      */
@@ -31,7 +31,7 @@ public RecordSetInner recordSet() {
     }
 
     /**
-     * Set the recordSet value.
+     * Set specifies information about the record set being updated.
      *
      * @param recordSet the recordSet value to set
      * @return the RecordSetUpdateParameters object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSets.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSets.java
index abc11f6ff6c4..97f1dcb3c381 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSets.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/RecordSets.java
@@ -21,7 +21,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -31,7 +31,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -44,7 +44,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -57,7 +57,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -69,7 +69,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -81,7 +81,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -92,7 +92,7 @@ public interface RecordSets extends HasInner<RecordSetsInner> {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SoaRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SoaRecord.java
index b774acfa4715..65b7a0554ada 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SoaRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SoaRecord.java
@@ -58,7 +58,7 @@ public class SoaRecord {
     private Long minimumTtl;
 
     /**
-     * Get the host value.
+     * Get the domain name of the authoritative name server for this SOA record.
      *
      * @return the host value
      */
@@ -67,7 +67,7 @@ public String host() {
     }
 
     /**
-     * Set the host value.
+     * Set the domain name of the authoritative name server for this SOA record.
      *
      * @param host the host value to set
      * @return the SoaRecord object itself.
@@ -78,7 +78,7 @@ public SoaRecord withHost(String host) {
     }
 
     /**
-     * Get the email value.
+     * Get the email contact for this SOA record.
      *
      * @return the email value
      */
@@ -87,7 +87,7 @@ public String email() {
     }
 
     /**
-     * Set the email value.
+     * Set the email contact for this SOA record.
      *
      * @param email the email value to set
      * @return the SoaRecord object itself.
@@ -98,7 +98,7 @@ public SoaRecord withEmail(String email) {
     }
 
     /**
-     * Get the serialNumber value.
+     * Get the serial number for this SOA record.
      *
      * @return the serialNumber value
      */
@@ -107,7 +107,7 @@ public Long serialNumber() {
     }
 
     /**
-     * Set the serialNumber value.
+     * Set the serial number for this SOA record.
      *
      * @param serialNumber the serialNumber value to set
      * @return the SoaRecord object itself.
@@ -118,7 +118,7 @@ public SoaRecord withSerialNumber(Long serialNumber) {
     }
 
     /**
-     * Get the refreshTime value.
+     * Get the refresh value for this SOA record.
      *
      * @return the refreshTime value
      */
@@ -127,7 +127,7 @@ public Long refreshTime() {
     }
 
     /**
-     * Set the refreshTime value.
+     * Set the refresh value for this SOA record.
      *
      * @param refreshTime the refreshTime value to set
      * @return the SoaRecord object itself.
@@ -138,7 +138,7 @@ public SoaRecord withRefreshTime(Long refreshTime) {
     }
 
     /**
-     * Get the retryTime value.
+     * Get the retry time for this SOA record.
      *
      * @return the retryTime value
      */
@@ -147,7 +147,7 @@ public Long retryTime() {
     }
 
     /**
-     * Set the retryTime value.
+     * Set the retry time for this SOA record.
      *
      * @param retryTime the retryTime value to set
      * @return the SoaRecord object itself.
@@ -158,7 +158,7 @@ public SoaRecord withRetryTime(Long retryTime) {
     }
 
     /**
-     * Get the expireTime value.
+     * Get the expire time for this SOA record.
      *
      * @return the expireTime value
      */
@@ -167,7 +167,7 @@ public Long expireTime() {
     }
 
     /**
-     * Set the expireTime value.
+     * Set the expire time for this SOA record.
      *
      * @param expireTime the expireTime value to set
      * @return the SoaRecord object itself.
@@ -178,7 +178,7 @@ public SoaRecord withExpireTime(Long expireTime) {
     }
 
     /**
-     * Get the minimumTtl value.
+     * Get the minimum value for this SOA record. By convention this is used to determine the negative caching duration.
      *
      * @return the minimumTtl value
      */
@@ -187,7 +187,7 @@ public Long minimumTtl() {
     }
 
     /**
-     * Set the minimumTtl value.
+     * Set the minimum value for this SOA record. By convention this is used to determine the negative caching duration.
      *
      * @param minimumTtl the minimumTtl value to set
      * @return the SoaRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SrvRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SrvRecord.java
index 22a04b584880..79fa6bf05236 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SrvRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/SrvRecord.java
@@ -39,7 +39,7 @@ public class SrvRecord {
     private String target;
 
     /**
-     * Get the priority value.
+     * Get the priority value for this SRV record.
      *
      * @return the priority value
      */
@@ -48,7 +48,7 @@ public Integer priority() {
     }
 
     /**
-     * Set the priority value.
+     * Set the priority value for this SRV record.
      *
      * @param priority the priority value to set
      * @return the SrvRecord object itself.
@@ -59,7 +59,7 @@ public SrvRecord withPriority(Integer priority) {
     }
 
     /**
-     * Get the weight value.
+     * Get the weight value for this SRV record.
      *
      * @return the weight value
      */
@@ -68,7 +68,7 @@ public Integer weight() {
     }
 
     /**
-     * Set the weight value.
+     * Set the weight value for this SRV record.
      *
      * @param weight the weight value to set
      * @return the SrvRecord object itself.
@@ -79,7 +79,7 @@ public SrvRecord withWeight(Integer weight) {
     }
 
     /**
-     * Get the port value.
+     * Get the port value for this SRV record.
      *
      * @return the port value
      */
@@ -88,7 +88,7 @@ public Integer port() {
     }
 
     /**
-     * Set the port value.
+     * Set the port value for this SRV record.
      *
      * @param port the port value to set
      * @return the SrvRecord object itself.
@@ -99,7 +99,7 @@ public SrvRecord withPort(Integer port) {
     }
 
     /**
-     * Get the target value.
+     * Get the target domain name for this SRV record.
      *
      * @return the target value
      */
@@ -108,7 +108,7 @@ public String target() {
     }
 
     /**
-     * Set the target value.
+     * Set the target domain name for this SRV record.
      *
      * @param target the target value to set
      * @return the SrvRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/TxtRecord.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/TxtRecord.java
index f21eca9b4881..f7920bdf832e 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/TxtRecord.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/TxtRecord.java
@@ -22,7 +22,7 @@ public class TxtRecord {
     private List<String> value;
 
     /**
-     * Get the value value.
+     * Get the text value of this TXT record.
      *
      * @return the value value
      */
@@ -31,7 +31,7 @@ public List<String> value() {
     }
 
     /**
-     * Set the value value.
+     * Set the text value of this TXT record.
      *
      * @param value the value value to set
      * @return the TxtRecord object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/Zone.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/Zone.java
index d2ef8c9a63c6..f7b4abeee70b 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/Zone.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/Zone.java
@@ -10,12 +10,12 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasResourceGroup;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.model.Updatable;
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.dns.v2017_10_01.implementation.NetworkManager;
 import java.util.List;
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ZoneUpdate.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ZoneUpdate.java
index 9bdd329592ad..b15a435f73a0 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ZoneUpdate.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/ZoneUpdate.java
@@ -22,7 +22,7 @@ public class ZoneUpdate {
     private Map<String, String> tags;
 
     /**
-     * Get the tags value.
+     * Get resource tags.
      *
      * @return the tags value
      */
@@ -31,7 +31,7 @@ public Map<String, String> tags() {
     }
 
     /**
-     * Set the tags value.
+     * Set resource tags.
      *
      * @param tags the tags value to set
      * @return the ZoneUpdate object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/DnsManagementClientImpl.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/DnsManagementClientImpl.java
index 640514f1bcfd..475971a5c900 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/DnsManagementClientImpl.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/DnsManagementClientImpl.java
@@ -28,11 +28,11 @@ public AzureClient getAzureClient() {
         return this.azureClient;
     }
 
-    /** Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription. */
+    /** The ID of the target subscription. */
     private String subscriptionId;
 
     /**
-     * Gets Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription.
+     * Gets The ID of the target subscription.
      *
      * @return the subscriptionId value.
      */
@@ -41,7 +41,7 @@ public String subscriptionId() {
     }
 
     /**
-     * Sets Specifies the Azure subscription ID, which uniquely identifies the Microsoft Azure subscription.
+     * Sets The ID of the target subscription.
      *
      * @param subscriptionId the subscriptionId value.
      * @return the service client itself
@@ -51,11 +51,11 @@ public DnsManagementClientImpl withSubscriptionId(String subscriptionId) {
         return this;
     }
 
-    /** Specifies the API version. */
+    /** The API version to use for this operation. */
     private String apiVersion;
 
     /**
-     * Gets Specifies the API version.
+     * Gets The API version to use for this operation.
      *
      * @return the apiVersion value.
      */
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetInner.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetInner.java
index e423b8ec35d1..3d3d87ba85e4 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetInner.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetInner.java
@@ -115,7 +115,7 @@ public class RecordSetInner extends ProxyResource {
     private List<CaaRecord> caaRecords;
 
     /**
-     * Get the etag value.
+     * Get the etag of the record set.
      *
      * @return the etag value
      */
@@ -124,7 +124,7 @@ public String etag() {
     }
 
     /**
-     * Set the etag value.
+     * Set the etag of the record set.
      *
      * @param etag the etag value to set
      * @return the RecordSetInner object itself.
@@ -135,7 +135,7 @@ public RecordSetInner withEtag(String etag) {
     }
 
     /**
-     * Get the metadata value.
+     * Get the metadata attached to the record set.
      *
      * @return the metadata value
      */
@@ -144,7 +144,7 @@ public Map<String, String> metadata() {
     }
 
     /**
-     * Set the metadata value.
+     * Set the metadata attached to the record set.
      *
      * @param metadata the metadata value to set
      * @return the RecordSetInner object itself.
@@ -155,7 +155,7 @@ public RecordSetInner withMetadata(Map<String, String> metadata) {
     }
 
     /**
-     * Get the tTL value.
+     * Get the TTL (time-to-live) of the records in the record set.
      *
      * @return the tTL value
      */
@@ -164,7 +164,7 @@ public Long tTL() {
     }
 
     /**
-     * Set the tTL value.
+     * Set the TTL (time-to-live) of the records in the record set.
      *
      * @param tTL the tTL value to set
      * @return the RecordSetInner object itself.
@@ -175,7 +175,7 @@ public RecordSetInner withTTL(Long tTL) {
     }
 
     /**
-     * Get the fqdn value.
+     * Get fully qualified domain name of the record set.
      *
      * @return the fqdn value
      */
@@ -184,7 +184,7 @@ public String fqdn() {
     }
 
     /**
-     * Get the aRecords value.
+     * Get the list of A records in the record set.
      *
      * @return the aRecords value
      */
@@ -193,7 +193,7 @@ public List<ARecord> aRecords() {
     }
 
     /**
-     * Set the aRecords value.
+     * Set the list of A records in the record set.
      *
      * @param aRecords the aRecords value to set
      * @return the RecordSetInner object itself.
@@ -204,7 +204,7 @@ public RecordSetInner withARecords(List<ARecord> aRecords) {
     }
 
     /**
-     * Get the aaaaRecords value.
+     * Get the list of AAAA records in the record set.
      *
      * @return the aaaaRecords value
      */
@@ -213,7 +213,7 @@ public List<AaaaRecord> aaaaRecords() {
     }
 
     /**
-     * Set the aaaaRecords value.
+     * Set the list of AAAA records in the record set.
      *
      * @param aaaaRecords the aaaaRecords value to set
      * @return the RecordSetInner object itself.
@@ -224,7 +224,7 @@ public RecordSetInner withAaaaRecords(List<AaaaRecord> aaaaRecords) {
     }
 
     /**
-     * Get the mxRecords value.
+     * Get the list of MX records in the record set.
      *
      * @return the mxRecords value
      */
@@ -233,7 +233,7 @@ public List<MxRecord> mxRecords() {
     }
 
     /**
-     * Set the mxRecords value.
+     * Set the list of MX records in the record set.
      *
      * @param mxRecords the mxRecords value to set
      * @return the RecordSetInner object itself.
@@ -244,7 +244,7 @@ public RecordSetInner withMxRecords(List<MxRecord> mxRecords) {
     }
 
     /**
-     * Get the nsRecords value.
+     * Get the list of NS records in the record set.
      *
      * @return the nsRecords value
      */
@@ -253,7 +253,7 @@ public List<NsRecord> nsRecords() {
     }
 
     /**
-     * Set the nsRecords value.
+     * Set the list of NS records in the record set.
      *
      * @param nsRecords the nsRecords value to set
      * @return the RecordSetInner object itself.
@@ -264,7 +264,7 @@ public RecordSetInner withNsRecords(List<NsRecord> nsRecords) {
     }
 
     /**
-     * Get the ptrRecords value.
+     * Get the list of PTR records in the record set.
      *
      * @return the ptrRecords value
      */
@@ -273,7 +273,7 @@ public List<PtrRecord> ptrRecords() {
     }
 
     /**
-     * Set the ptrRecords value.
+     * Set the list of PTR records in the record set.
      *
      * @param ptrRecords the ptrRecords value to set
      * @return the RecordSetInner object itself.
@@ -284,7 +284,7 @@ public RecordSetInner withPtrRecords(List<PtrRecord> ptrRecords) {
     }
 
     /**
-     * Get the srvRecords value.
+     * Get the list of SRV records in the record set.
      *
      * @return the srvRecords value
      */
@@ -293,7 +293,7 @@ public List<SrvRecord> srvRecords() {
     }
 
     /**
-     * Set the srvRecords value.
+     * Set the list of SRV records in the record set.
      *
      * @param srvRecords the srvRecords value to set
      * @return the RecordSetInner object itself.
@@ -304,7 +304,7 @@ public RecordSetInner withSrvRecords(List<SrvRecord> srvRecords) {
     }
 
     /**
-     * Get the txtRecords value.
+     * Get the list of TXT records in the record set.
      *
      * @return the txtRecords value
      */
@@ -313,7 +313,7 @@ public List<TxtRecord> txtRecords() {
     }
 
     /**
-     * Set the txtRecords value.
+     * Set the list of TXT records in the record set.
      *
      * @param txtRecords the txtRecords value to set
      * @return the RecordSetInner object itself.
@@ -324,7 +324,7 @@ public RecordSetInner withTxtRecords(List<TxtRecord> txtRecords) {
     }
 
     /**
-     * Get the cnameRecord value.
+     * Get the CNAME record in the  record set.
      *
      * @return the cnameRecord value
      */
@@ -333,7 +333,7 @@ public CnameRecord cnameRecord() {
     }
 
     /**
-     * Set the cnameRecord value.
+     * Set the CNAME record in the  record set.
      *
      * @param cnameRecord the cnameRecord value to set
      * @return the RecordSetInner object itself.
@@ -344,7 +344,7 @@ public RecordSetInner withCnameRecord(CnameRecord cnameRecord) {
     }
 
     /**
-     * Get the soaRecord value.
+     * Get the SOA record in the record set.
      *
      * @return the soaRecord value
      */
@@ -353,7 +353,7 @@ public SoaRecord soaRecord() {
     }
 
     /**
-     * Set the soaRecord value.
+     * Set the SOA record in the record set.
      *
      * @param soaRecord the soaRecord value to set
      * @return the RecordSetInner object itself.
@@ -364,7 +364,7 @@ public RecordSetInner withSoaRecord(SoaRecord soaRecord) {
     }
 
     /**
-     * Get the caaRecords value.
+     * Get the list of CAA records in the record set.
      *
      * @return the caaRecords value
      */
@@ -373,7 +373,7 @@ public List<CaaRecord> caaRecords() {
     }
 
     /**
-     * Set the caaRecords value.
+     * Set the list of CAA records in the record set.
      *
      * @param caaRecords the caaRecords value to set
      * @return the RecordSetInner object itself.
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsImpl.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsImpl.java
index 985bccf538de..25c782c726c0 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsImpl.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsImpl.java
@@ -103,7 +103,8 @@ public Observable<RecordSet> listByTypeAsync(final String resourceGroupName, fin
             public Iterable<RecordSetInner> call(Page<RecordSetInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RecordSetInner, RecordSet>() {
+        })
+        .map(new Func1<RecordSetInner, RecordSet>() {
             @Override
             public RecordSet call(RecordSetInner inner) {
                 return new RecordSetImpl(inner, manager());
@@ -120,7 +121,8 @@ public Observable<RecordSet> listAllByDnsZoneAsync(final String resourceGroupNam
             public Iterable<RecordSetInner> call(Page<RecordSetInner> page) {
                 return page.items();
             }
-        })    .map(new Func1<RecordSetInner, RecordSet>() {
+        })
+        .map(new Func1<RecordSetInner, RecordSet>() {
             @Override
             public RecordSet call(RecordSetInner inner) {
                 return new RecordSetImpl(inner, manager());
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsInner.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsInner.java
index 053a8f9923e8..00be4d94f81e 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsInner.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/RecordSetsInner.java
@@ -108,7 +108,7 @@ interface RecordSetsService {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -125,7 +125,7 @@ public RecordSetInner update(String resourceGroupName, String zoneName, String r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -141,7 +141,7 @@ public ServiceFuture<RecordSetInner> updateAsync(String resourceGroupName, Strin
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -161,7 +161,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -210,7 +210,7 @@ public Observable<ServiceResponse<RecordSetInner>> call(Response<ResponseBody> r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -228,7 +228,7 @@ public RecordSetInner update(String resourceGroupName, String zoneName, String r
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -245,7 +245,7 @@ public ServiceFuture<RecordSetInner> updateAsync(String resourceGroupName, Strin
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -266,7 +266,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -322,7 +322,7 @@ private ServiceResponse<RecordSetInner> updateDelegate(Response<ResponseBody> re
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -339,7 +339,7 @@ public RecordSetInner createOrUpdate(String resourceGroupName, String zoneName,
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -355,7 +355,7 @@ public ServiceFuture<RecordSetInner> createOrUpdateAsync(String resourceGroupNam
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -375,7 +375,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -425,7 +425,7 @@ public Observable<ServiceResponse<RecordSetInner>> call(Response<ResponseBody> r
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -444,7 +444,7 @@ public RecordSetInner createOrUpdate(String resourceGroupName, String zoneName,
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -462,7 +462,7 @@ public ServiceFuture<RecordSetInner> createOrUpdateAsync(String resourceGroupNam
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -484,7 +484,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Creates or updates a record set within a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA can be updated but not created (they are created when the DNS zone is created). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -542,7 +542,7 @@ private ServiceResponse<RecordSetInner> createOrUpdateDelegate(Response<Response
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -557,7 +557,7 @@ public void delete(String resourceGroupName, String zoneName, String relativeRec
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -572,7 +572,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -591,7 +591,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -635,7 +635,7 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -651,7 +651,7 @@ public void delete(String resourceGroupName, String zoneName, String relativeRec
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -667,7 +667,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -687,7 +687,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a record set from a DNS zone. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Record sets of type SOA cannot be deleted (they are deleted when the DNS zone is deleted). Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -739,7 +739,7 @@ private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) th
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -755,7 +755,7 @@ public RecordSetInner get(String resourceGroupName, String zoneName, String rela
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -770,7 +770,7 @@ public ServiceFuture<RecordSetInner> getAsync(String resourceGroupName, String z
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -789,7 +789,7 @@ public RecordSetInner call(ServiceResponse<RecordSetInner> response) {
     /**
      * Gets a record set.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param relativeRecordSetName The name of the record set, relative to the name of the zone.
      * @param recordType The type of DNS record in this record set. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
@@ -839,7 +839,7 @@ private ServiceResponse<RecordSetInner> getDelegate(Response<ResponseBody> respo
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -860,7 +860,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -882,7 +882,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -901,7 +901,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -924,7 +924,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -965,7 +965,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(Response<ResponseB
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -988,7 +988,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1012,7 +1012,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1033,7 +1033,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1058,7 +1058,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists the record sets of a specified type in a DNS zone.
      *
-    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<RecordSetInner>> * @param zoneName The name of the DNS zone (without a terminating dot).
     ServiceResponse<PageImpl<RecordSetInner>> * @param recordType The type of record sets to enumerate. Possible values include: 'A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SOA', 'SRV', 'TXT'
     ServiceResponse<PageImpl<RecordSetInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
@@ -1106,7 +1106,7 @@ private ServiceResponse<PageImpl<RecordSetInner>> listByTypeDelegate(Response<Re
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -1126,7 +1126,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1147,7 +1147,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1165,7 +1165,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1187,7 +1187,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecordSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
@@ -1224,7 +1224,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(Response<ResponseB
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1246,7 +1246,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1269,7 +1269,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1289,7 +1289,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1313,7 +1313,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<RecordSetInner>> * @param zoneName The name of the DNS zone (without a terminating dot).
     ServiceResponse<PageImpl<RecordSetInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
     ServiceResponse<PageImpl<RecordSetInner>> * @param recordsetnamesuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1357,7 +1357,7 @@ private ServiceResponse<PageImpl<RecordSetInner>> listByDnsZoneDelegate(Response
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -1377,7 +1377,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1398,7 +1398,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1416,7 +1416,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;RecordSetInner&gt; object
@@ -1438,7 +1438,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;RecordSetInner&gt; object wrapped in {@link ServiceResponse} if successful.
@@ -1475,7 +1475,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(Response<ResponseB
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordSetNameSuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1497,7 +1497,7 @@ public Page<RecordSetInner> nextPage(String nextPageLink) {
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordSetNameSuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1520,7 +1520,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(String nextPageLin
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordSetNameSuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1540,7 +1540,7 @@ public Page<RecordSetInner> call(ServiceResponse<Page<RecordSetInner>> response)
     /**
      * Lists all record sets in a DNS zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param recordSetNameSuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
@@ -1564,7 +1564,7 @@ public Observable<ServiceResponse<Page<RecordSetInner>>> call(ServiceResponse<Pa
     /**
      * Lists all record sets in a DNS zone.
      *
-    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<RecordSetInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<RecordSetInner>> * @param zoneName The name of the DNS zone (without a terminating dot).
     ServiceResponse<PageImpl<RecordSetInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
     ServiceResponse<PageImpl<RecordSetInner>> * @param recordSetNameSuffix The suffix label of the record set name that has to be used to filter the record set enumerations. If this parameter is specified, Enumeration will return only records that end with .&lt;recordSetNameSuffix&gt;
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZoneInner.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZoneInner.java
index 4db1b5521e4b..f3a56a83ad35 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZoneInner.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZoneInner.java
@@ -47,7 +47,7 @@ public class ZoneInner extends Resource {
     private List<String> nameServers;
 
     /**
-     * Get the etag value.
+     * Get the etag of the zone.
      *
      * @return the etag value
      */
@@ -56,7 +56,7 @@ public String etag() {
     }
 
     /**
-     * Set the etag value.
+     * Set the etag of the zone.
      *
      * @param etag the etag value to set
      * @return the ZoneInner object itself.
@@ -67,7 +67,7 @@ public ZoneInner withEtag(String etag) {
     }
 
     /**
-     * Get the maxNumberOfRecordSets value.
+     * Get the maximum number of record sets that can be created in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the maxNumberOfRecordSets value
      */
@@ -76,7 +76,7 @@ public Long maxNumberOfRecordSets() {
     }
 
     /**
-     * Get the numberOfRecordSets value.
+     * Get the current number of record sets in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the numberOfRecordSets value
      */
@@ -85,7 +85,7 @@ public Long numberOfRecordSets() {
     }
 
     /**
-     * Get the nameServers value.
+     * Get the name servers for this DNS zone. This is a read-only property and any attempt to set this value will be ignored.
      *
      * @return the nameServers value
      */
diff --git a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZonesInner.java b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZonesInner.java
index 91ff828dbaa3..ae806695389f 100644
--- a/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZonesInner.java
+++ b/dns/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/dns/v2017_10_01/implementation/ZonesInner.java
@@ -108,7 +108,7 @@ interface ZonesService {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -123,7 +123,7 @@ public ZoneInner createOrUpdate(String resourceGroupName, String zoneName, ZoneI
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -137,7 +137,7 @@ public ServiceFuture<ZoneInner> createOrUpdateAsync(String resourceGroupName, St
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -155,7 +155,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -197,7 +197,7 @@ public Observable<ServiceResponse<ZoneInner>> call(Response<ResponseBody> respon
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -214,7 +214,7 @@ public ZoneInner createOrUpdate(String resourceGroupName, String zoneName, ZoneI
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -230,7 +230,7 @@ public ServiceFuture<ZoneInner> createOrUpdateAsync(String resourceGroupName, St
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -250,7 +250,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Creates or updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param parameters Parameters supplied to the CreateOrUpdate operation.
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
@@ -300,7 +300,7 @@ private ServiceResponse<ZoneInner> createOrUpdateDelegate(Response<ResponseBody>
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -313,7 +313,7 @@ public void delete(String resourceGroupName, String zoneName) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -326,7 +326,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -343,7 +343,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -368,7 +368,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -382,7 +382,7 @@ public void delete(String resourceGroupName, String zoneName, String ifMatch) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -396,7 +396,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String zoneName
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -414,7 +414,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -440,7 +440,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -453,7 +453,7 @@ public void beginDelete(String resourceGroupName, String zoneName) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -466,7 +466,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String zon
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
@@ -483,7 +483,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
@@ -519,7 +519,7 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -533,7 +533,7 @@ public void beginDelete(String resourceGroupName, String zoneName, String ifMatc
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -547,7 +547,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String zon
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -565,7 +565,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a DNS zone. WARNING: All DNS records in the zone will also be deleted. This operation cannot be undone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -610,7 +610,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -624,7 +624,7 @@ public ZoneInner getByResourceGroup(String resourceGroupName, String zoneName) {
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -637,7 +637,7 @@ public ServiceFuture<ZoneInner> getByResourceGroupAsync(String resourceGroupName
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -654,7 +654,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Gets a DNS zone. Retrieves the zone properties, but not the record sets within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -696,7 +696,7 @@ private ServiceResponse<ZoneInner> getByResourceGroupDelegate(Response<ResponseB
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -710,7 +710,7 @@ public ZoneInner update(String resourceGroupName, String zoneName) {
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -723,7 +723,7 @@ public ServiceFuture<ZoneInner> updateAsync(String resourceGroupName, String zon
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -740,7 +740,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ZoneInner object
@@ -779,7 +779,7 @@ public Observable<ServiceResponse<ZoneInner>> call(Response<ResponseBody> respon
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
      * @param tags Resource tags.
@@ -795,7 +795,7 @@ public ZoneInner update(String resourceGroupName, String zoneName, String ifMatc
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
      * @param tags Resource tags.
@@ -810,7 +810,7 @@ public ServiceFuture<ZoneInner> updateAsync(String resourceGroupName, String zon
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
      * @param tags Resource tags.
@@ -829,7 +829,7 @@ public ZoneInner call(ServiceResponse<ZoneInner> response) {
     /**
      * Updates a DNS zone. Does not modify DNS records within the zone.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param zoneName The name of the DNS zone (without a terminating dot).
      * @param ifMatch The etag of the DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
      * @param tags Resource tags.
@@ -876,7 +876,7 @@ private ServiceResponse<ZoneInner> updateDelegate(Response<ResponseBody> respons
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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
@@ -895,7 +895,7 @@ public Page<ZoneInner> nextPage(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
@@ -915,7 +915,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
      */
@@ -932,7 +932,7 @@ public Page<ZoneInner> call(ServiceResponse<Page<ZoneInner>> response) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
      */
@@ -953,7 +953,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(ServiceResponse<Page<Zo
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ZoneInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
@@ -985,7 +985,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(Response<ResponseBody>
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -1005,7 +1005,7 @@ public Page<ZoneInner> nextPage(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -1026,7 +1026,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(String nextPageLink) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
@@ -1044,7 +1044,7 @@ public Page<ZoneInner> call(ServiceResponse<Page<ZoneInner>> response) {
     /**
      * Lists the DNS zones within a resource group.
      *
-     * @param resourceGroupName The name of the resource group.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;ZoneInner&gt; object
@@ -1066,7 +1066,7 @@ public Observable<ServiceResponse<Page<ZoneInner>>> call(ServiceResponse<Page<Zo
     /**
      * Lists the DNS zones within a resource group.
      *
-    ServiceResponse<PageImpl<ZoneInner>> * @param resourceGroupName The name of the resource group.
+    ServiceResponse<PageImpl<ZoneInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl<ZoneInner>> * @param top The maximum number of record sets to return. If not specified, returns up to 100 record sets.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;ZoneInner&gt; object wrapped in {@link ServiceResponse} if successful.
diff --git a/features/resource-manager/v2015_12_01/pom.xml b/features/resource-manager/v2015_12_01/pom.xml
index 0dc1d4e394f7..81d826d0890d 100644
--- a/features/resource-manager/v2015_12_01/pom.xml
+++ b/features/resource-manager/v2015_12_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.features.v2015_12_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-features</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Features Management</name>
-    <description>This package contains Microsoft Features Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.features.v2015_12_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-features</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Features Management</name>
+    <description>This package contains Microsoft Features Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/locks/resource-manager/v2016_09_01/pom.xml b/locks/resource-manager/v2016_09_01/pom.xml
index 9296e8359d29..709a030f6d8d 100644
--- a/locks/resource-manager/v2016_09_01/pom.xml
+++ b/locks/resource-manager/v2016_09_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.locks.v2016_09_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-locks</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Authorization Management</name>
-    <description>This package contains Microsoft Authorization Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.locks.v2016_09_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-locks</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Features Management</name>
+    <description>This package contains Microsoft Features Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/OperationDisplay.java b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/OperationDisplay.java
new file mode 100644
index 000000000000..e23dbc327b57
--- /dev/null
+++ b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/OperationDisplay.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.locks.v2016_09_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The object that represents the operation.
+ */
+public class OperationDisplay {
+    /**
+     * Service provider: Microsoft.Authorization.
+     */
+    @JsonProperty(value = "provider")
+    private String provider;
+
+    /**
+     * Resource on which the operation is performed: Profile, endpoint, etc.
+     */
+    @JsonProperty(value = "resource")
+    private String resource;
+
+    /**
+     * Operation type: Read, write, delete, etc.
+     */
+    @JsonProperty(value = "operation")
+    private String operation;
+
+    /**
+     * Get service provider: Microsoft.Authorization.
+     *
+     * @return the provider value
+     */
+    public String provider() {
+        return this.provider;
+    }
+
+    /**
+     * Set service provider: Microsoft.Authorization.
+     *
+     * @param provider the provider value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withProvider(String provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    /**
+     * Get resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @return the resource value
+     */
+    public String resource() {
+        return this.resource;
+    }
+
+    /**
+     * Set resource on which the operation is performed: Profile, endpoint, etc.
+     *
+     * @param resource the resource value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withResource(String resource) {
+        this.resource = resource;
+        return this;
+    }
+
+    /**
+     * Get operation type: Read, write, delete, etc.
+     *
+     * @return the operation value
+     */
+    public String operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set operation type: Read, write, delete, etc.
+     *
+     * @param operation the operation value to set
+     * @return the OperationDisplay object itself.
+     */
+    public OperationDisplay withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+}
diff --git a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/LocksManager.java b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/LocksManager.java
index c477e6c55f89..1f5d2ceaccb2 100644
--- a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/LocksManager.java
+++ b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/LocksManager.java
@@ -21,7 +21,7 @@
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
 /**
- * Entry point to Azure Authorization resource management.
+ * Entry point to Azure Features resource management.
  */
 public final class LocksManager extends ManagerCore<LocksManager, ManagementLockClientImpl> {
     private ManagementLocks managementLocks;
@@ -34,7 +34,7 @@ public static Configurable configure() {
         return new LocksManager.ConfigurableImpl();
     }
     /**
-    * Creates an instance of LocksManager that exposes Authorization resource management API entry points.
+    * Creates an instance of LocksManager that exposes Features resource management API entry points.
     *
     * @param credentials the credentials to use
     * @param subscriptionId the subscription UUID
@@ -49,7 +49,7 @@ public static LocksManager authenticate(AzureTokenCredentials credentials, Strin
             .build(), subscriptionId);
     }
     /**
-    * Creates an instance of LocksManager that exposes Authorization resource management API entry points.
+    * Creates an instance of LocksManager that exposes Features resource management API entry points.
     *
     * @param restClient the RestClient to be used for API calls.
     * @param subscriptionId the subscription UUID
@@ -63,11 +63,11 @@ public static LocksManager authenticate(RestClient restClient, String subscripti
     */
     public interface Configurable extends AzureConfigurable<Configurable> {
         /**
-        * Creates an instance of LocksManager that exposes Authorization management API entry points.
+        * Creates an instance of LocksManager that exposes Features management API entry points.
         *
         * @param credentials the credentials to use
         * @param subscriptionId the subscription UUID
-        * @return the interface exposing Authorization management API entry points that work across subscriptions
+        * @return the interface exposing Features management API entry points that work across subscriptions
         */
         LocksManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
     }
diff --git a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLockClientImpl.java b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLockClientImpl.java
index ecedf9e3d14f..9a154d916f9b 100644
--- a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLockClientImpl.java
+++ b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/ManagementLockClientImpl.java
@@ -8,15 +8,36 @@
 
 package com.microsoft.azure.management.locks.v2016_09_01.implementation;
 
+import com.google.common.reflect.TypeToken;
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.RestClient;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
 
 /**
  * Initializes a new instance of the ManagementLockClientImpl class.
  */
 public class ManagementLockClientImpl extends AzureServiceClient {
+    /** The Retrofit service to perform REST calls. */
+    private ManagementLockClientService service;
     /** the {@link AzureClient} used for long running operations. */
     private AzureClient azureClient;
 
@@ -182,6 +203,7 @@ protected void initialize() {
         this.generateClientRequestId = true;
         this.managementLocks = new ManagementLocksInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
+        initializeService();
     }
 
     /**
@@ -193,4 +215,239 @@ protected void initialize() {
     public String userAgent() {
         return String.format("%s (%s, %s)", super.userAgent(), "ManagementLockClient", "2016-09-01");
     }
+
+    private void initializeService() {
+        service = restClient().retrofit().create(ManagementLockClientService.class);
+    }
+
+    /**
+     * The interface defining all the services for ManagementLockClient to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagementLockClientService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.locks.v2016_09_01.ManagementLockClient listOperations" })
+        @GET("providers/Microsoft.Features/operations")
+        Observable<Response<ResponseBody>> listOperations(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.locks.v2016_09_01.ManagementLockClient listOperationsNext" })
+        @GET
+        Observable<Response<ResponseBody>> listOperationsNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @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 PagedList&lt;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> listOperations() {
+        ServiceResponse<Page<OperationInner>> response = listOperationsSinglePageAsync().toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @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<List<OperationInner>> listOperationsAsync(final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listOperationsSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listOperationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listOperationsAsync() {
+        return listOperationsWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listOperationsWithServiceResponseAsync() {
+        return listOperationsSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listOperationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listOperationsSinglePageAsync() {
+        if (this.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.apiVersion() is required and cannot be null.");
+        }
+        return service.listOperations(this.apiVersion(), this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listOperationsDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listOperationsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;OperationInner&gt; object if successful.
+     */
+    public PagedList<OperationInner> listOperationsNext(final String nextPageLink) {
+        ServiceResponse<Page<OperationInner>> response = listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<OperationInner>(response.body()) {
+            @Override
+            public Page<OperationInner> nextPage(String nextPageLink) {
+                return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<OperationInner>> listOperationsNextAsync(final String nextPageLink, final ServiceFuture<List<OperationInner>> serviceFuture, final ListOperationCallback<OperationInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listOperationsNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(String nextPageLink) {
+                    return listOperationsNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<Page<OperationInner>> listOperationsNextAsync(final String nextPageLink) {
+        return listOperationsNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<OperationInner>>, Page<OperationInner>>() {
+                @Override
+                public Page<OperationInner> call(ServiceResponse<Page<OperationInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;OperationInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listOperationsNextWithServiceResponseAsync(final String nextPageLink) {
+        return listOperationsNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<OperationInner>>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(ServiceResponse<Page<OperationInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listOperationsNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Lists all of the available Microsoft.Authorization REST API operations.
+     *
+    ServiceResponse<PageImpl<OperationInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;OperationInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<OperationInner>>> listOperationsNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listOperationsNext(nextUrl, this.acceptLanguage(), this.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<OperationInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<OperationInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<OperationInner>> result = listOperationsNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<OperationInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<OperationInner>> listOperationsNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.restClient().responseBuilderFactory().<PageImpl<OperationInner>, CloudException>newInstance(this.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<OperationInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
 }
diff --git a/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/OperationInner.java b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/OperationInner.java
new file mode 100644
index 000000000000..218a9b8c5f48
--- /dev/null
+++ b/locks/resource-manager/v2016_09_01/src/main/java/com/microsoft/azure/management/locks/v2016_09_01/implementation/OperationInner.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.locks.v2016_09_01.implementation;
+
+import com.microsoft.azure.management.locks.v2016_09_01.OperationDisplay;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Microsoft.Authorization operation.
+ */
+public class OperationInner {
+    /**
+     * Operation name: {provider}/{resource}/{operation}.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * The object that represents the operation.
+     */
+    @JsonProperty(value = "display")
+    private OperationDisplay display;
+
+    /**
+     * Get operation name: {provider}/{resource}/{operation}.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set operation name: {provider}/{resource}/{operation}.
+     *
+     * @param name the name value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the object that represents the operation.
+     *
+     * @return the display value
+     */
+    public OperationDisplay display() {
+        return this.display;
+    }
+
+    /**
+     * Set the object that represents the operation.
+     *
+     * @param display the display value to set
+     * @return the OperationInner object itself.
+     */
+    public OperationInner withDisplay(OperationDisplay display) {
+        this.display = display;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2017_10_01/pom.xml b/network/resource-manager/v2017_10_01/pom.xml
index 14a2d0abb63d..0765ba1756f0 100644
--- a/network/resource-manager/v2017_10_01/pom.xml
+++ b/network/resource-manager/v2017_10_01/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
+        <version>0.0.2-beta</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-network</artifactId>
@@ -19,7 +19,7 @@
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Network Management</name>
     <description>This package contains Microsoft Network Management SDK.</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
         </license>
     </licenses>
     <scm>
-        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
         <tag>HEAD</tag>
     </scm>
     <properties>
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ApplicationGateway.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ApplicationGateway.java
index b6ae7da8acad..4bceea415a2b 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ApplicationGateway.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ApplicationGateway.java
@@ -148,229 +148,191 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify EnableHttp2.
+         * The stage of the applicationgateway update allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Etag.
+         * The stage of the applicationgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendPorts.
+         * The stage of the applicationgateway update allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next definition stage
              */
             WithCreate withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify HttpListeners.
+         * The stage of the applicationgateway update allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Probes.
+         * The stage of the applicationgateway update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ProvisioningState.
+         * The stage of the applicationgateway update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ResourceGuid.
+         * The stage of the applicationgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Sku.
+         * The stage of the applicationgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslCertificates.
+         * The stage of the applicationgateway update allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslPolicy.
+         * The stage of the applicationgateway update allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next definition stage
              */
             WithCreate withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
@@ -394,229 +356,191 @@ interface Update extends Appliable<ApplicationGateway>, Resource.UpdateWithTags<
      */
     interface UpdateStages {
         /**
-         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway {0} allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway {0} allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify EnableHttp2.
+         * The stage of the applicationgateway {0} allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next update stage
              */
             Update withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Etag.
+         * The stage of the applicationgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendPorts.
+         * The stage of the applicationgateway {0} allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next update stage
              */
             Update withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify HttpListeners.
+         * The stage of the applicationgateway {0} allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next update stage
              */
             Update withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Probes.
+         * The stage of the applicationgateway {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next update stage
              */
             Update withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ProvisioningState.
+         * The stage of the applicationgateway {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next update stage
              */
             Update withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway {0} allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next update stage
              */
             Update withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ResourceGuid.
+         * The stage of the applicationgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Sku.
+         * The stage of the applicationgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next update stage
              */
             Update withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslCertificates.
+         * The stage of the applicationgateway {0} allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslPolicy.
+         * The stage of the applicationgateway {0} allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next update stage
              */
             Update withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway {0} allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next update stage
              */
             Update withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway {0} allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next update stage
              */
             Update withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ConnectionMonitorResult.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ConnectionMonitorResult.java
index a6cc6d617f07..71ce8929613c 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ConnectionMonitorResult.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ConnectionMonitorResult.java
@@ -111,9 +111,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group containing Network Watcher
-            * @param networkWatcherName The name of the Network Watcher resource
-            * @return the next definition stage
             */
             WithDestination withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -124,8 +121,6 @@ interface WithNetworkWatcher {
         interface WithDestination {
            /**
             * Specifies destination.
-            * @param destination the destination parameter value
-            * @return the next definition stage
             */
             WithSource withDestination(ConnectionMonitorDestination destination);
         }
@@ -136,8 +131,6 @@ interface WithDestination {
         interface WithSource {
            /**
             * Specifies source.
-            * @param source the source parameter value
-            * @return the next definition stage
             */
             WithCreate withSource(ConnectionMonitorSource source);
         }
@@ -148,8 +141,6 @@ interface WithSource {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next definition stage
              */
             WithCreate withAutoStart(Boolean autoStart);
         }
@@ -160,8 +151,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -172,8 +161,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next definition stage
              */
             WithCreate withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -184,8 +171,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -214,8 +199,6 @@ interface UpdateStages {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next update stage
              */
             Update withAutoStart(Boolean autoStart);
         }
@@ -226,8 +209,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next update stage
              */
             Update withLocation(String location);
         }
@@ -238,8 +219,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next update stage
              */
             Update withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -250,8 +229,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuit.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuit.java
index 0c850a4e20a1..aecb9a3cad7e 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuit.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuit.java
@@ -110,133 +110,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next definition stage
              */
             WithCreate withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Authorizations.
+         * The stage of the expressroutecircuit update allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next definition stage
              */
             WithCreate withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next definition stage
              */
             WithCreate withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Peerings.
+         * The stage of the expressroutecircuit update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next definition stage
              */
             WithCreate withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next definition stage
              */
             WithCreate withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Sku.
+         * The stage of the expressroutecircuit update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next definition stage
              */
             WithCreate withSku(ExpressRouteCircuitSku sku);
         }
@@ -260,133 +238,111 @@ interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit {0} allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next update stage
              */
             Update withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Authorizations.
+         * The stage of the expressroutecircuit {0} allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next update stage
              */
             Update withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next update stage
              */
             Update withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit {0} allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Peerings.
+         * The stage of the expressroutecircuit {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next update stage
              */
             Update withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next update stage
              */
             Update withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next update stage
              */
             Update withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next update stage
              */
             Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Sku.
+         * The stage of the expressroutecircuit {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next update stage
              */
             Update withSku(ExpressRouteCircuitSku sku);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitAuthorization.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitAuthorization.java
index 7d2900c8560d..2b7bae6ac0a3 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitAuthorization.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitAuthorization.java
@@ -74,9 +74,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -87,8 +84,6 @@ interface WithExpressRouteCircuit {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
@@ -99,8 +94,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next definition stage
              */
             WithCreate withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -111,8 +104,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -123,8 +114,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -135,8 +124,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -165,8 +152,6 @@ interface UpdateStages {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
@@ -177,8 +162,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next update stage
              */
             Update withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -189,8 +172,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -201,8 +182,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -213,8 +192,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeering.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeering.java
index 575d9a5752b4..91887f25c886 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeering.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/ExpressRouteCircuitPeering.java
@@ -146,9 +146,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -159,8 +156,6 @@ interface WithExpressRouteCircuit {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next definition stage
              */
             WithCreate withAzureASN(Integer azureASN);
         }
@@ -171,8 +166,6 @@ interface WithAzureASN {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -183,8 +176,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -195,8 +186,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next definition stage
              */
             WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -207,8 +196,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next definition stage
              */
             WithCreate withLastModifiedBy(String lastModifiedBy);
         }
@@ -219,8 +206,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next definition stage
              */
             WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -231,8 +216,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -243,8 +226,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next definition stage
              */
             WithCreate withPeerASN(Long peerASN);
         }
@@ -255,8 +236,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The PeeringType. Possible values are: 'AzurePublicPeering', 'AzurePrivatePeering', and 'MicrosoftPeering'. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next definition stage
              */
             WithCreate withPeeringType(ExpressRouteCircuitPeeringType peeringType);
         }
@@ -267,8 +246,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next definition stage
              */
             WithCreate withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -279,8 +256,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next definition stage
              */
             WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -291,8 +266,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -303,8 +276,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next definition stage
              */
             WithCreate withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -315,8 +286,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next definition stage
              */
             WithCreate withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -327,8 +296,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next definition stage
              */
             WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -339,8 +306,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -351,8 +316,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The state of peering. Possible values are: 'Disabled' and 'Enabled'. Possible values include: 'Disabled', 'Enabled'
-             * @return the next definition stage
              */
             WithCreate withState(ExpressRouteCircuitPeeringState state);
         }
@@ -363,8 +326,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next definition stage
              */
             WithCreate withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -375,8 +336,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next definition stage
              */
             WithCreate withVlanId(Integer vlanId);
         }
@@ -405,8 +364,6 @@ interface UpdateStages {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next update stage
              */
             Update withAzureASN(Integer azureASN);
         }
@@ -417,8 +374,6 @@ interface WithAzureASN {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -429,8 +384,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -441,8 +394,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next update stage
              */
             Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -453,8 +404,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next update stage
              */
             Update withLastModifiedBy(String lastModifiedBy);
         }
@@ -465,8 +414,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next update stage
              */
             Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -477,8 +424,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -489,8 +434,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next update stage
              */
             Update withPeerASN(Long peerASN);
         }
@@ -501,8 +444,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The PeeringType. Possible values are: 'AzurePublicPeering', 'AzurePrivatePeering', and 'MicrosoftPeering'. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next update stage
              */
             Update withPeeringType(ExpressRouteCircuitPeeringType peeringType);
         }
@@ -513,8 +454,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next update stage
              */
             Update withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -525,8 +464,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next update stage
              */
             Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -537,8 +474,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -549,8 +484,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next update stage
              */
             Update withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -561,8 +494,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next update stage
              */
             Update withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -573,8 +504,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next update stage
              */
             Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -585,8 +514,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -597,8 +524,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The state of peering. Possible values are: 'Disabled' and 'Enabled'. Possible values include: 'Disabled', 'Enabled'
-             * @return the next update stage
              */
             Update withState(ExpressRouteCircuitPeeringState state);
         }
@@ -609,8 +534,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next update stage
              */
             Update withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -621,8 +544,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next update stage
              */
             Update withVlanId(Integer vlanId);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/InboundNatRule.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/InboundNatRule.java
index c524d787d24e..d0cae3c4d958 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/InboundNatRule.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/InboundNatRule.java
@@ -100,9 +100,6 @@ interface Blank extends WithLoadBalancer {
         interface WithLoadBalancer {
            /**
             * Specifies resourceGroupName, loadBalancerName.
-            * @param resourceGroupName The name of the resource group
-            * @param loadBalancerName The name of the load balancer
-            * @return the next definition stage
             */
             WithCreate withExistingLoadBalancer(String resourceGroupName, String loadBalancerName);
         }
@@ -113,8 +110,6 @@ interface WithLoadBalancer {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next definition stage
              */
             WithCreate withBackendPort(Integer backendPort);
         }
@@ -125,8 +120,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next definition stage
              */
             WithCreate withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -137,8 +130,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -149,8 +140,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -161,8 +150,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next definition stage
              */
             WithCreate withFrontendPort(Integer frontendPort);
         }
@@ -173,8 +160,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -185,8 +170,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -197,8 +180,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -209,8 +190,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next definition stage
              */
             WithCreate withProtocol(TransportProtocol protocol);
         }
@@ -221,8 +200,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -251,8 +228,6 @@ interface UpdateStages {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next update stage
              */
             Update withBackendPort(Integer backendPort);
         }
@@ -263,8 +238,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next update stage
              */
             Update withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -275,8 +248,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -287,8 +258,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next update stage
              */
             Update withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -299,8 +268,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next update stage
              */
             Update withFrontendPort(Integer frontendPort);
         }
@@ -311,8 +278,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -335,8 +298,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -347,8 +308,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next update stage
              */
             Update withProtocol(TransportProtocol protocol);
         }
@@ -359,8 +318,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LoadBalancer.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LoadBalancer.java
index 2cf6a7f65390..6599d441fc6d 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LoadBalancer.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LoadBalancer.java
@@ -108,133 +108,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Etag.
+         * The stage of the loadbalancer update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatPools.
+         * The stage of the loadbalancer update allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatRules.
+         * The stage of the loadbalancer update allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next definition stage
              */
             WithCreate withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Probes.
+         * The stage of the loadbalancer update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ProvisioningState.
+         * The stage of the loadbalancer update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ResourceGuid.
+         * The stage of the loadbalancer update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Sku.
+         * The stage of the loadbalancer update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next definition stage
              */
             WithCreate withSku(LoadBalancerSku sku);
         }
@@ -258,133 +236,111 @@ interface Update extends Appliable<LoadBalancer>, Resource.UpdateWithTags<Update
      */
     interface UpdateStages {
         /**
-         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Etag.
+         * The stage of the loadbalancer {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatPools.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer {0} allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next update stage
              */
             Update withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next update stage
              */
             Update withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Probes.
+         * The stage of the loadbalancer {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next update stage
              */
             Update withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ProvisioningState.
+         * The stage of the loadbalancer {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ResourceGuid.
+         * The stage of the loadbalancer {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Sku.
+         * The stage of the loadbalancer {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next update stage
              */
             Update withSku(LoadBalancerSku sku);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LocalNetworkGateway.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LocalNetworkGateway.java
index 58d59df1b041..038cae5b6619 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LocalNetworkGateway.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/LocalNetworkGateway.java
@@ -77,61 +77,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify Etag.
+         * The stage of the localnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next definition stage
              */
             WithCreate withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
@@ -155,61 +145,51 @@ interface Update extends Appliable<LocalNetworkGateway>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify Etag.
+         * The stage of the localnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway {0} allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next update stage
              */
             Update withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway {0} allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next update stage
              */
             Update withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkInterface.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkInterface.java
index 5315e2f75a34..64a6d573de2c 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkInterface.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkInterface.java
@@ -106,133 +106,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify DnsSettings.
+         * The stage of the networkinterface update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next definition stage
              */
             WithCreate withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next definition stage
              */
             WithCreate withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Etag.
+         * The stage of the networkinterface update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify IpConfigurations.
+         * The stage of the networkinterface update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify MacAddress.
+         * The stage of the networkinterface update allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next definition stage
              */
             WithCreate withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Primary.
+         * The stage of the networkinterface update allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next definition stage
              */
             WithCreate withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ProvisioningState.
+         * The stage of the networkinterface update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ResourceGuid.
+         * The stage of the networkinterface update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify VirtualMachine.
+         * The stage of the networkinterface update allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next definition stage
              */
             WithCreate withVirtualMachine(SubResource virtualMachine);
         }
@@ -256,133 +234,111 @@ interface Update extends Appliable<NetworkInterface>, Resource.UpdateWithTags<Up
      */
     interface UpdateStages {
         /**
-         * The stage of the networkinterface update allowing to specify DnsSettings.
+         * The stage of the networkinterface {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next update stage
              */
             Update withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface {0} allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next update stage
              */
             Update withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface {0} allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next update stage
              */
             Update withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Etag.
+         * The stage of the networkinterface {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify IpConfigurations.
+         * The stage of the networkinterface {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next update stage
              */
             Update withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify MacAddress.
+         * The stage of the networkinterface {0} allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next update stage
              */
             Update withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface {0} allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Primary.
+         * The stage of the networkinterface {0} allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next update stage
              */
             Update withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ProvisioningState.
+         * The stage of the networkinterface {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ResourceGuid.
+         * The stage of the networkinterface {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify VirtualMachine.
+         * The stage of the networkinterface {0} allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next update stage
              */
             Update withVirtualMachine(SubResource virtualMachine);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroup.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroup.java
index e445face72d7..d8f4d852da36 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroup.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroup.java
@@ -84,61 +84,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next definition stage
              */
             WithCreate withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify Etag.
+         * The stage of the networksecuritygroup update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next definition stage
              */
             WithCreate withSecurityRules(List<SecurityRuleInner> securityRules);
         }
@@ -162,61 +152,51 @@ interface Update extends Appliable<NetworkSecurityGroup>, Resource.UpdateWithTag
      */
     interface UpdateStages {
         /**
-         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next update stage
              */
             Update withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify Etag.
+         * The stage of the networksecuritygroup {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next update stage
              */
             Update withSecurityRules(List<SecurityRuleInner> securityRules);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java
index d315cb404a37..811b22b1a777 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkSecurityGroupSecurityRule.java
@@ -141,9 +141,6 @@ interface Blank extends WithNetworkSecurityGroup {
         interface WithNetworkSecurityGroup {
            /**
             * Specifies resourceGroupName, networkSecurityGroupName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkSecurityGroupName The name of the network security group
-            * @return the next definition stage
             */
             WithAccess withExistingNetworkSecurityGroup(String resourceGroupName, String networkSecurityGroupName);
         }
@@ -154,8 +151,6 @@ interface WithNetworkSecurityGroup {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The network traffic is allowed or denied. Possible values are: 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithDirection withAccess(SecurityRuleAccess access);
         }
@@ -166,8 +161,6 @@ interface WithAccess {
         interface WithDirection {
            /**
             * Specifies direction.
-            * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound'
-            * @return the next definition stage
             */
             WithProtocol withDirection(SecurityRuleDirection direction);
         }
@@ -178,8 +171,6 @@ interface WithDirection {
         interface WithProtocol {
            /**
             * Specifies protocol.
-            * @param protocol Network protocol this rule applies to. Possible values are 'Tcp', 'Udp', and '*'. Possible values include: 'Tcp', 'Udp', '*'
-            * @return the next definition stage
             */
             WithCreate withProtocol(SecurityRuleProtocol protocol);
         }
@@ -190,8 +181,6 @@ interface WithProtocol {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next definition stage
              */
             WithCreate withDescription(String description);
         }
@@ -202,8 +191,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -214,8 +201,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -226,8 +211,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next definition stage
              */
             WithCreate withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -238,8 +221,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRange(String destinationPortRange);
         }
@@ -250,8 +231,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -262,8 +241,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -274,8 +251,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -286,8 +261,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -298,8 +271,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next definition stage
              */
             WithCreate withPriority(Integer priority);
         }
@@ -310,8 +281,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -322,8 +291,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -334,8 +301,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -346,8 +311,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next definition stage
              */
             WithCreate withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -358,8 +321,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withSourcePortRange(String sourcePortRange);
         }
@@ -370,8 +331,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next definition stage
              */
             WithCreate withSourcePortRanges(List<String> sourcePortRanges);
         }
@@ -400,8 +359,6 @@ interface UpdateStages {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next update stage
              */
             Update withDescription(String description);
         }
@@ -412,8 +369,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next update stage
              */
             Update withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -424,8 +379,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next update stage
              */
             Update withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -436,8 +389,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next update stage
              */
             Update withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -448,8 +399,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withDestinationPortRange(String destinationPortRange);
         }
@@ -460,8 +409,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next update stage
              */
             Update withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -472,8 +419,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -484,8 +429,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -496,8 +439,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -508,8 +449,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next update stage
              */
             Update withPriority(Integer priority);
         }
@@ -520,8 +459,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -532,8 +469,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next update stage
              */
             Update withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -544,8 +479,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next update stage
              */
             Update withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -556,8 +489,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next update stage
              */
             Update withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -568,8 +499,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withSourcePortRange(String sourcePortRange);
         }
@@ -580,8 +509,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next update stage
              */
             Update withSourcePortRanges(List<String> sourcePortRanges);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkWatcher.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkWatcher.java
index c36f097ba365..286bd789cd23 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkWatcher.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/NetworkWatcher.java
@@ -57,13 +57,11 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkwatcher definition allowing to specify Etag.
+         * The stage of the networkwatcher update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -87,13 +85,11 @@ interface Update extends Appliable<NetworkWatcher>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the networkwatcher update allowing to specify Etag.
+         * The stage of the networkwatcher {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PacketCaptureResult.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PacketCaptureResult.java
index ffcde54f7f02..494c74af81c8 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PacketCaptureResult.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PacketCaptureResult.java
@@ -95,9 +95,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkWatcherName The name of the network watcher
-            * @return the next definition stage
             */
             WithStorageLocation withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -108,8 +105,6 @@ interface WithNetworkWatcher {
         interface WithStorageLocation {
            /**
             * Specifies storageLocation.
-            * @param storageLocation the storageLocation parameter value
-            * @return the next definition stage
             */
             WithTarget withStorageLocation(PacketCaptureStorageLocation storageLocation);
         }
@@ -120,8 +115,6 @@ interface WithStorageLocation {
         interface WithTarget {
            /**
             * Specifies target.
-            * @param target The ID of the targeted resource, only VM is currently supported
-            * @return the next definition stage
             */
             WithCreate withTarget(String target);
         }
@@ -132,8 +125,6 @@ interface WithTarget {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next definition stage
              */
             WithCreate withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -144,8 +135,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next definition stage
              */
             WithCreate withFilters(List<PacketCaptureFilter> filters);
         }
@@ -156,8 +145,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next definition stage
              */
             WithCreate withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -168,8 +155,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next definition stage
              */
             WithCreate withTotalBytesPerSession(Integer totalBytesPerSession);
         }
@@ -198,8 +183,6 @@ interface UpdateStages {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next update stage
              */
             Update withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -210,8 +193,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next update stage
              */
             Update withFilters(List<PacketCaptureFilter> filters);
         }
@@ -222,8 +203,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next update stage
              */
             Update withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -234,8 +213,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next update stage
              */
             Update withTotalBytesPerSession(Integer totalBytesPerSession);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PublicIPAddress.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PublicIPAddress.java
index fe221e3490e5..b6c57a337aab 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PublicIPAddress.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/PublicIPAddress.java
@@ -103,121 +103,101 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify DnsSettings.
+         * The stage of the publicipaddress update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Etag.
+         * The stage of the publicipaddress update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IpAddress.
+         * The stage of the publicipaddress update allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next definition stage
              */
             WithCreate withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ProvisioningState.
+         * The stage of the publicipaddress update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ResourceGuid.
+         * The stage of the publicipaddress update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Sku.
+         * The stage of the publicipaddress update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next definition stage
              */
             WithCreate withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Zones.
+         * The stage of the publicipaddress update allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -241,121 +221,101 @@ interface Update extends Appliable<PublicIPAddress>, Resource.UpdateWithTags<Upd
      */
     interface UpdateStages {
         /**
-         * The stage of the publicipaddress update allowing to specify DnsSettings.
+         * The stage of the publicipaddress {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next update stage
              */
             Update withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Etag.
+         * The stage of the publicipaddress {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress {0} allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IpAddress.
+         * The stage of the publicipaddress {0} allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next update stage
              */
             Update withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ProvisioningState.
+         * The stage of the publicipaddress {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next update stage
              */
             Update withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next update stage
              */
             Update withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ResourceGuid.
+         * The stage of the publicipaddress {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Sku.
+         * The stage of the publicipaddress {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next update stage
              */
             Update withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Zones.
+         * The stage of the publicipaddress {0} allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next update stage
              */
             Update withZones(List<String> zones);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Route.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Route.java
index b9b725fcbcc2..daafb36bf4cd 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Route.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Route.java
@@ -79,9 +79,6 @@ interface Blank extends WithRouteTable {
         interface WithRouteTable {
            /**
             * Specifies resourceGroupName, routeTableName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeTableName The name of the route table
-            * @return the next definition stage
             */
             WithNextHopType withExistingRouteTable(String resourceGroupName, String routeTableName);
         }
@@ -92,8 +89,6 @@ interface WithRouteTable {
         interface WithNextHopType {
            /**
             * Specifies nextHopType.
-            * @param nextHopType The type of Azure hop the packet should be sent to. Possible values are: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', and 'None'. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'
-            * @return the next definition stage
             */
             WithCreate withNextHopType(RouteNextHopType nextHopType);
         }
@@ -104,8 +99,6 @@ interface WithNextHopType {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -116,8 +109,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -128,8 +119,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -140,8 +129,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -152,8 +139,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next definition stage
              */
             WithCreate withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -164,8 +149,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -194,8 +177,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -206,8 +187,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -218,8 +197,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -230,8 +207,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -242,8 +217,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next update stage
              */
             Update withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -254,8 +227,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilter.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilter.java
index cdbeb89961e9..ec914861450f 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilter.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilter.java
@@ -70,25 +70,21 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Peerings.
+         * The stage of the routefilter update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Rules.
+         * The stage of the routefilter update allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next definition stage
              */
             WithCreate withRules(List<RouteFilterRuleInner> rules);
         }
@@ -112,25 +108,21 @@ interface Update extends Appliable<RouteFilter>, Resource.UpdateWithTags<Update>
      */
     interface UpdateStages {
         /**
-         * The stage of the routefilter update allowing to specify Peerings.
+         * The stage of the routefilter {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter update allowing to specify Rules.
+         * The stage of the routefilter {0} allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next update stage
              */
             Update withRules(List<RouteFilterRuleInner> rules);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilterRule.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilterRule.java
index 77c4daff4569..d354c1ca28c1 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilterRule.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteFilterRule.java
@@ -91,9 +91,6 @@ interface Blank extends WithRouteFilter {
         interface WithRouteFilter {
            /**
             * Specifies resourceGroupName, routeFilterName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeFilterName The name of the route filter
-            * @return the next definition stage
             */
             WithAccess withExistingRouteFilter(String resourceGroupName, String routeFilterName);
         }
@@ -104,8 +101,6 @@ interface WithRouteFilter {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The access type of the rule. Valid values are: 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithCommunities withAccess(Access access);
         }
@@ -116,8 +111,6 @@ interface WithAccess {
         interface WithCommunities {
            /**
             * Specifies communities.
-            * @param communities The collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020']
-            * @return the next definition stage
             */
             WithRouteFilterRuleType withCommunities(List<String> communities);
         }
@@ -128,8 +121,6 @@ interface WithCommunities {
         interface WithRouteFilterRuleType {
            /**
             * Specifies routeFilterRuleType.
-            * @param routeFilterRuleType The rule type of the rule. Valid value is: 'Community'
-            * @return the next definition stage
             */
             WithCreate withRouteFilterRuleType(String routeFilterRuleType);
         }
@@ -140,8 +131,6 @@ interface WithRouteFilterRuleType {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -152,8 +141,6 @@ interface WithId {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -164,8 +151,6 @@ interface WithLocation {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -176,8 +161,6 @@ interface WithName {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -206,8 +189,6 @@ interface UpdateStages {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -218,8 +199,6 @@ interface WithId {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteTable.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteTable.java
index 0bcef05f3fdd..5d96193b1677 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteTable.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/RouteTable.java
@@ -74,49 +74,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routetable definition allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next definition stage
              */
             WithCreate withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Etag.
+         * The stage of the routetable update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify ProvisioningState.
+         * The stage of the routetable update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Routes.
+         * The stage of the routetable update allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next definition stage
              */
             WithCreate withRoutes(List<RouteInner> routes);
         }
@@ -140,49 +132,41 @@ interface Update extends Appliable<RouteTable>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable {0} allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next update stage
              */
             Update withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Etag.
+         * The stage of the routetable {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable update allowing to specify ProvisioningState.
+         * The stage of the routetable {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Routes.
+         * The stage of the routetable {0} allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next update stage
              */
             Update withRoutes(List<RouteInner> routes);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Subnet.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Subnet.java
index 6bed9f0ebe46..4d28267f0a03 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Subnet.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/Subnet.java
@@ -97,9 +97,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -110,8 +107,6 @@ interface WithVirtualNetwork {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -122,8 +117,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -134,8 +127,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -146,8 +137,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -158,8 +147,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -170,8 +157,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -182,8 +167,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next definition stage
              */
             WithCreate withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -194,8 +177,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next definition stage
              */
             WithCreate withRouteTable(RouteTableInner routeTable);
         }
@@ -206,8 +187,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next definition stage
              */
             WithCreate withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
@@ -236,8 +215,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -248,8 +225,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -260,8 +235,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -272,8 +245,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -284,8 +255,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -296,8 +265,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -308,8 +275,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next update stage
              */
             Update withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -320,8 +285,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next update stage
              */
             Update withRouteTable(RouteTableInner routeTable);
         }
@@ -332,8 +295,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next update stage
              */
             Update withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetwork.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetwork.java
index 9fa86f0e6487..3acb2291c364 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetwork.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetwork.java
@@ -95,109 +95,91 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify AddressSpace.
+         * The stage of the virtualnetwork update allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next definition stage
              */
             WithCreate withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next definition stage
              */
             WithCreate withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if Vm protection is enabled for all the subnets in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Etag.
+         * The stage of the virtualnetwork update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Subnets.
+         * The stage of the virtualnetwork update allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
@@ -221,109 +203,91 @@ interface Update extends Appliable<VirtualNetwork>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetwork update allowing to specify AddressSpace.
+         * The stage of the virtualnetwork {0} allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next update stage
              */
             Update withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork {0} allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next update stage
              */
             Update withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in a Virtual Network
-             * @return the next update stage
              */
             Update withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if Vm protection is enabled for all the subnets in a Virtual Network
-             * @return the next update stage
              */
             Update withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Etag.
+         * The stage of the virtualnetwork {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Subnets.
+         * The stage of the virtualnetwork {0} allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next update stage
              */
             Update withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork {0} allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next update stage
              */
             Update withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGateway.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGateway.java
index 2ef8d9d2fda3..6cd6576fa118 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGateway.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGateway.java
@@ -109,133 +109,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next definition stage
              */
             WithCreate withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Etag.
+         * The stage of the virtualnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next definition stage
              */
             WithCreate withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next definition stage
              */
             WithCreate withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Sku.
+         * The stage of the virtualnetworkgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next definition stage
              */
             WithCreate withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next definition stage
              */
             WithCreate withVpnType(VpnType vpnType);
         }
@@ -259,133 +237,111 @@ interface Update extends Appliable<VirtualNetworkGateway>, Resource.UpdateWithTa
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next update stage
              */
             Update withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Etag.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next update stage
              */
             Update withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next update stage
              */
             Update withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next update stage
              */
             Update withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Sku.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next update stage
              */
             Update withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next update stage
              */
             Update withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next update stage
              */
             Update withVpnType(VpnType vpnType);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java
index b48ddaa781cc..4a6be4c84b9e 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkGatewayConnection.java
@@ -146,9 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithConnectionType {
            /**
             * Specifies connectionType.
-            * @param connectionType Gateway connection type. Possible values are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'
-            * @return the next definition stage
-*/
+            */
             WithVirtualNetworkGateway1 withConnectionType(VirtualNetworkGatewayConnectionType connectionType);
         }
 
@@ -158,140 +156,116 @@ interface WithConnectionType {
         interface WithVirtualNetworkGateway1 {
            /**
             * Specifies virtualNetworkGateway1.
-            * @param virtualNetworkGateway1 The reference to virtual network gateway resource
-            * @return the next definition stage
-*/
+            */
             WithCreate withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next definition stage
              */
             WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next definition stage
              */
             WithCreate withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next definition stage
              */
             WithCreate withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next definition stage
              */
             WithCreate withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
@@ -315,133 +289,111 @@ interface Update extends Appliable<VirtualNetworkGatewayConnection>, Resource.Up
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next update stage
              */
             Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next update stage
              */
             Update withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next update stage
              */
             Update withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next update stage
              */
             Update withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next update stage
              */
             Update withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next update stage
              */
             Update withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkPeering.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkPeering.java
index afc6f4b98301..8e1be9f2642e 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkPeering.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/VirtualNetworkPeering.java
@@ -100,9 +100,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -113,8 +110,6 @@ interface WithVirtualNetwork {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next definition stage
              */
             WithCreate withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -125,8 +120,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next definition stage
              */
             WithCreate withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -137,8 +130,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next definition stage
              */
             WithCreate withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -149,8 +140,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -161,8 +150,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -173,8 +160,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -185,8 +170,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next definition stage
              */
             WithCreate withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -197,8 +180,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -209,8 +190,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next definition stage
              */
             WithCreate withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -221,8 +200,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next definition stage
              */
             WithCreate withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -233,8 +210,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next definition stage
              */
             WithCreate withUseRemoteGateways(Boolean useRemoteGateways);
         }
@@ -263,8 +238,6 @@ interface UpdateStages {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next update stage
              */
             Update withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -275,8 +248,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next update stage
              */
             Update withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -287,8 +258,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next update stage
              */
             Update withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -299,8 +268,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -311,8 +278,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -335,8 +298,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next update stage
              */
             Update withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -347,8 +308,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -359,8 +318,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next update stage
              */
             Update withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -371,8 +328,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next update stage
              */
             Update withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -383,8 +338,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next update stage
              */
             Update withUseRemoteGateways(Boolean useRemoteGateways);
         }
diff --git a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/implementation/NetworkManagementClientImpl.java b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/implementation/NetworkManagementClientImpl.java
index a4c2939eaf07..d88f747e0ee4 100644
--- a/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/implementation/NetworkManagementClientImpl.java
+++ b/network/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/network/v2017_10_01/implementation/NetworkManagementClientImpl.java
@@ -68,11 +68,11 @@ public NetworkManagementClientImpl withSubscriptionId(String subscriptionId) {
         return this;
     }
 
-    /** The preferred language for the response. */
+    /** Gets or sets the preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets The preferred language for the response.
+     * Gets Gets or sets the preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -81,7 +81,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets The preferred language for the response.
+     * Sets Gets or sets the preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -91,11 +91,11 @@ public NetworkManagementClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
     private int longRunningOperationRetryTimeout;
 
     /**
-     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -104,7 +104,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -114,11 +114,11 @@ public NetworkManagementClientImpl withLongRunningOperationRetryTimeout(int long
         return this;
     }
 
-    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
     private boolean generateClientRequestId;
 
     /**
-     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @return the generateClientRequestId value.
      */
@@ -127,7 +127,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -700,7 +700,7 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "NetworkManagementClient", "2017-10-01");
+        return String.format("%s (%s)", super.userAgent(), "NetworkManagementClient");
     }
 
     private void initializeService() {
diff --git a/network/resource-manager/v2018_04_01/pom.xml b/network/resource-manager/v2018_04_01/pom.xml
index 06692df6b54e..22c1113461a9 100644
--- a/network/resource-manager/v2018_04_01/pom.xml
+++ b/network/resource-manager/v2018_04_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.network.v2018_04_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-network</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Network Management</name>
-    <description>This package contains Microsoft Network Management SDK.</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.network.v2018_04_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-network</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Network Management</name>
+    <description>This package contains Microsoft Network Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGateway.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGateway.java
index c12c4f506b81..0eaa758fb770 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGateway.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ApplicationGateway.java
@@ -163,265 +163,221 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify AutoscaleConfiguration.
+         * The stage of the applicationgateway update allowing to specify AutoscaleConfiguration.
          */
         interface WithAutoscaleConfiguration {
             /**
              * Specifies autoscaleConfiguration.
-             * @param autoscaleConfiguration Autoscale Configuration
-             * @return the next definition stage
              */
             WithCreate withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify EnableFips.
+         * The stage of the applicationgateway update allowing to specify EnableFips.
          */
         interface WithEnableFips {
             /**
              * Specifies enableFips.
-             * @param enableFips Whether FIPS is enabled on the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withEnableFips(Boolean enableFips);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify EnableHttp2.
+         * The stage of the applicationgateway update allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Etag.
+         * The stage of the applicationgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendPorts.
+         * The stage of the applicationgateway update allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next definition stage
              */
             WithCreate withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify HttpListeners.
+         * The stage of the applicationgateway update allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Probes.
+         * The stage of the applicationgateway update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ProvisioningState.
+         * The stage of the applicationgateway update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ResourceGuid.
+         * The stage of the applicationgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Sku.
+         * The stage of the applicationgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslCertificates.
+         * The stage of the applicationgateway update allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslPolicy.
+         * The stage of the applicationgateway update allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next definition stage
              */
             WithCreate withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Zones.
+         * The stage of the applicationgateway update allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting where the resource needs to come from
-             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -445,265 +401,221 @@ interface Update extends Appliable<ApplicationGateway>, Resource.UpdateWithTags<
      */
     interface UpdateStages {
         /**
-         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway {0} allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify AutoscaleConfiguration.
+         * The stage of the applicationgateway {0} allowing to specify AutoscaleConfiguration.
          */
         interface WithAutoscaleConfiguration {
             /**
              * Specifies autoscaleConfiguration.
-             * @param autoscaleConfiguration Autoscale Configuration
-             * @return the next update stage
              */
             Update withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway {0} allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify EnableFips.
+         * The stage of the applicationgateway {0} allowing to specify EnableFips.
          */
         interface WithEnableFips {
             /**
              * Specifies enableFips.
-             * @param enableFips Whether FIPS is enabled on the application gateway resource
-             * @return the next update stage
              */
             Update withEnableFips(Boolean enableFips);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify EnableHttp2.
+         * The stage of the applicationgateway {0} allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next update stage
              */
             Update withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Etag.
+         * The stage of the applicationgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendPorts.
+         * The stage of the applicationgateway {0} allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next update stage
              */
             Update withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify HttpListeners.
+         * The stage of the applicationgateway {0} allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next update stage
              */
             Update withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Probes.
+         * The stage of the applicationgateway {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next update stage
              */
             Update withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ProvisioningState.
+         * The stage of the applicationgateway {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next update stage
              */
             Update withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway {0} allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next update stage
              */
             Update withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ResourceGuid.
+         * The stage of the applicationgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Sku.
+         * The stage of the applicationgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next update stage
              */
             Update withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslCertificates.
+         * The stage of the applicationgateway {0} allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslPolicy.
+         * The stage of the applicationgateway {0} allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next update stage
              */
             Update withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway {0} allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next update stage
              */
             Update withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway {0} allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next update stage
              */
             Update withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Zones.
+         * The stage of the applicationgateway {0} allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting where the resource needs to come from
-             * @return the next update stage
              */
             Update withZones(List<String> zones);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/AzureFirewall.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/AzureFirewall.java
index 0aa9a5261c78..6139f2ebd98f 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/AzureFirewall.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/AzureFirewall.java
@@ -73,49 +73,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify ApplicationRuleCollections.
+         * The stage of the azurefirewall update allowing to specify ApplicationRuleCollections.
          */
         interface WithApplicationRuleCollections {
             /**
              * Specifies applicationRuleCollections.
-             * @param applicationRuleCollections Collection of application rule collections used by a Azure Firewall
-             * @return the next definition stage
              */
             WithCreate withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify IpConfigurations.
+         * The stage of the azurefirewall update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configuration of the Azure Firewall resource
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify NetworkRuleCollections.
+         * The stage of the azurefirewall update allowing to specify NetworkRuleCollections.
          */
         interface WithNetworkRuleCollections {
             /**
              * Specifies networkRuleCollections.
-             * @param networkRuleCollections Collection of network rule collections used by a Azure Firewall
-             * @return the next definition stage
              */
             WithCreate withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify ProvisioningState.
+         * The stage of the azurefirewall update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -139,49 +131,41 @@ interface Update extends Appliable<AzureFirewall>, Resource.UpdateWithTags<Updat
      */
     interface UpdateStages {
         /**
-         * The stage of the azurefirewall update allowing to specify ApplicationRuleCollections.
+         * The stage of the azurefirewall {0} allowing to specify ApplicationRuleCollections.
          */
         interface WithApplicationRuleCollections {
             /**
              * Specifies applicationRuleCollections.
-             * @param applicationRuleCollections Collection of application rule collections used by a Azure Firewall
-             * @return the next update stage
              */
             Update withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify IpConfigurations.
+         * The stage of the azurefirewall {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configuration of the Azure Firewall resource
-             * @return the next update stage
              */
             Update withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify NetworkRuleCollections.
+         * The stage of the azurefirewall {0} allowing to specify NetworkRuleCollections.
          */
         interface WithNetworkRuleCollections {
             /**
              * Specifies networkRuleCollections.
-             * @param networkRuleCollections Collection of network rule collections used by a Azure Firewall
-             * @return the next update stage
              */
             Update withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify ProvisioningState.
+         * The stage of the azurefirewall {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ConnectionMonitorResult.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ConnectionMonitorResult.java
index 93b9782c52e6..3fdff65d549c 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ConnectionMonitorResult.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ConnectionMonitorResult.java
@@ -111,9 +111,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group containing Network Watcher
-            * @param networkWatcherName The name of the Network Watcher resource
-            * @return the next definition stage
             */
             WithDestination withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -124,8 +121,6 @@ interface WithNetworkWatcher {
         interface WithDestination {
            /**
             * Specifies destination.
-            * @param destination the destination parameter value
-            * @return the next definition stage
             */
             WithSource withDestination(ConnectionMonitorDestination destination);
         }
@@ -136,8 +131,6 @@ interface WithDestination {
         interface WithSource {
            /**
             * Specifies source.
-            * @param source the source parameter value
-            * @return the next definition stage
             */
             WithCreate withSource(ConnectionMonitorSource source);
         }
@@ -148,8 +141,6 @@ interface WithSource {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next definition stage
              */
             WithCreate withAutoStart(Boolean autoStart);
         }
@@ -160,8 +151,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -172,8 +161,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next definition stage
              */
             WithCreate withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -184,8 +171,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -214,8 +199,6 @@ interface UpdateStages {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next update stage
              */
             Update withAutoStart(Boolean autoStart);
         }
@@ -226,8 +209,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next update stage
              */
             Update withLocation(String location);
         }
@@ -238,8 +219,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next update stage
              */
             Update withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -250,8 +229,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuit.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuit.java
index 7de19cef7968..21d48426d64f 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuit.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuit.java
@@ -110,133 +110,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next definition stage
              */
             WithCreate withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Authorizations.
+         * The stage of the expressroutecircuit update allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next definition stage
              */
             WithCreate withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next definition stage
              */
             WithCreate withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Peerings.
+         * The stage of the expressroutecircuit update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next definition stage
              */
             WithCreate withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next definition stage
              */
             WithCreate withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Sku.
+         * The stage of the expressroutecircuit update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next definition stage
              */
             WithCreate withSku(ExpressRouteCircuitSku sku);
         }
@@ -260,133 +238,111 @@ interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit {0} allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next update stage
              */
             Update withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Authorizations.
+         * The stage of the expressroutecircuit {0} allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next update stage
              */
             Update withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next update stage
              */
             Update withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit {0} allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Peerings.
+         * The stage of the expressroutecircuit {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next update stage
              */
             Update withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next update stage
              */
             Update withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next update stage
              */
             Update withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next update stage
              */
             Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Sku.
+         * The stage of the expressroutecircuit {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next update stage
              */
             Update withSku(ExpressRouteCircuitSku sku);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitAuthorization.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitAuthorization.java
index ea9b80b064e8..79d61ce41d18 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitAuthorization.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitAuthorization.java
@@ -74,9 +74,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -87,8 +84,6 @@ interface WithExpressRouteCircuit {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
@@ -99,8 +94,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next definition stage
              */
             WithCreate withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -111,8 +104,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -123,8 +114,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -135,8 +124,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -165,8 +152,6 @@ interface UpdateStages {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
@@ -177,8 +162,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next update stage
              */
             Update withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -189,8 +172,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -201,8 +182,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -213,8 +192,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitConnection.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitConnection.java
index 47d6be6821c2..86ad0fe503b7 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitConnection.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitConnection.java
@@ -90,10 +90,6 @@ interface Blank extends WithPeering {
         interface WithPeering {
            /**
             * Specifies resourceGroupName, circuitName, peeringName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @param peeringName The name of the peering
-            * @return the next definition stage
             */
             WithCreate withExistingPeering(String resourceGroupName, String circuitName, String peeringName);
         }
@@ -104,8 +100,6 @@ interface WithPeering {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -116,8 +110,6 @@ interface WithAddressPrefix {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
@@ -128,8 +120,6 @@ interface WithAuthorizationKey {
         interface WithExpressRouteCircuitPeering {
             /**
              * Specifies expressRouteCircuitPeering.
-             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
-             * @return the next definition stage
              */
             WithCreate withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
         }
@@ -140,8 +130,6 @@ interface WithExpressRouteCircuitPeering {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -152,8 +140,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -164,8 +150,6 @@ interface WithName {
         interface WithPeerExpressRouteCircuitPeering {
             /**
              * Specifies peerExpressRouteCircuitPeering.
-             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
-             * @return the next definition stage
              */
             WithCreate withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
         }
@@ -194,8 +178,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -206,8 +188,6 @@ interface WithAddressPrefix {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
@@ -218,8 +198,6 @@ interface WithAuthorizationKey {
         interface WithExpressRouteCircuitPeering {
             /**
              * Specifies expressRouteCircuitPeering.
-             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
-             * @return the next update stage
              */
             Update withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
         }
@@ -230,8 +208,6 @@ interface WithExpressRouteCircuitPeering {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -242,8 +218,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -254,8 +228,6 @@ interface WithName {
         interface WithPeerExpressRouteCircuitPeering {
             /**
              * Specifies peerExpressRouteCircuitPeering.
-             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
-             * @return the next update stage
              */
             Update withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeering.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeering.java
index 1afe4c9a94c5..594b32de9a47 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeering.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCircuitPeering.java
@@ -153,9 +153,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -166,8 +163,6 @@ interface WithExpressRouteCircuit {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next definition stage
              */
             WithCreate withAzureASN(Integer azureASN);
         }
@@ -178,8 +173,6 @@ interface WithAzureASN {
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
-             * @return the next definition stage
              */
             WithCreate withConnections(List<ExpressRouteCircuitConnectionInner> connections);
         }
@@ -190,8 +183,6 @@ interface WithConnections {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -202,8 +193,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -214,8 +203,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next definition stage
              */
             WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -226,8 +213,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next definition stage
              */
             WithCreate withLastModifiedBy(String lastModifiedBy);
         }
@@ -238,8 +223,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next definition stage
              */
             WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -250,8 +233,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -262,8 +243,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next definition stage
              */
             WithCreate withPeerASN(Long peerASN);
         }
@@ -274,8 +253,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next definition stage
              */
             WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -286,8 +263,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next definition stage
              */
             WithCreate withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -298,8 +273,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next definition stage
              */
             WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -310,8 +283,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -322,8 +293,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next definition stage
              */
             WithCreate withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -334,8 +303,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next definition stage
              */
             WithCreate withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -346,8 +313,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next definition stage
              */
             WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -358,8 +323,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -370,8 +333,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next definition stage
              */
             WithCreate withState(ExpressRoutePeeringState state);
         }
@@ -382,8 +343,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next definition stage
              */
             WithCreate withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -394,8 +353,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next definition stage
              */
             WithCreate withVlanId(Integer vlanId);
         }
@@ -424,8 +381,6 @@ interface UpdateStages {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next update stage
              */
             Update withAzureASN(Integer azureASN);
         }
@@ -436,8 +391,6 @@ interface WithAzureASN {
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
-             * @return the next update stage
              */
             Update withConnections(List<ExpressRouteCircuitConnectionInner> connections);
         }
@@ -448,8 +401,6 @@ interface WithConnections {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -460,8 +411,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -472,8 +421,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next update stage
              */
             Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -484,8 +431,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next update stage
              */
             Update withLastModifiedBy(String lastModifiedBy);
         }
@@ -496,8 +441,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next update stage
              */
             Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -508,8 +451,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -520,8 +461,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next update stage
              */
             Update withPeerASN(Long peerASN);
         }
@@ -532,8 +471,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next update stage
              */
             Update withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -544,8 +481,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next update stage
              */
             Update withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -556,8 +491,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next update stage
              */
             Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -568,8 +501,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -580,8 +511,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next update stage
              */
             Update withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -592,8 +521,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next update stage
              */
             Update withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -604,8 +531,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next update stage
              */
             Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -616,8 +541,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -628,8 +551,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next update stage
              */
             Update withState(ExpressRoutePeeringState state);
         }
@@ -640,8 +561,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next update stage
              */
             Update withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -652,8 +571,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next update stage
              */
             Update withVlanId(Integer vlanId);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnection.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnection.java
index d24059143249..5d2ad91cab62 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnection.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnection.java
@@ -104,73 +104,61 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify BandwidthInMbps.
+         * The stage of the expressroutecrossconnection update allowing to specify BandwidthInMbps.
          */
         interface WithBandwidthInMbps {
             /**
              * Specifies bandwidthInMbps.
-             * @param bandwidthInMbps The circuit bandwidth In Mbps
-             * @return the next definition stage
              */
             WithCreate withBandwidthInMbps(Integer bandwidthInMbps);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ExpressRouteCircuit.
+         * The stage of the expressroutecrossconnection update allowing to specify ExpressRouteCircuit.
          */
         interface WithExpressRouteCircuit {
             /**
              * Specifies expressRouteCircuit.
-             * @param expressRouteCircuit The ExpressRouteCircuit
-             * @return the next definition stage
              */
             WithCreate withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify PeeringLocation.
+         * The stage of the expressroutecrossconnection update allowing to specify PeeringLocation.
          */
         interface WithPeeringLocation {
             /**
              * Specifies peeringLocation.
-             * @param peeringLocation The peering location of the ExpressRoute circuit
-             * @return the next definition stage
              */
             WithCreate withPeeringLocation(String peeringLocation);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify Peerings.
+         * The stage of the expressroutecrossconnection update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
-             * @return the next definition stage
              */
             WithCreate withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
@@ -194,73 +182,61 @@ interface Update extends Appliable<ExpressRouteCrossConnection>, Resource.Update
      */
     interface UpdateStages {
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify BandwidthInMbps.
+         * The stage of the expressroutecrossconnection {0} allowing to specify BandwidthInMbps.
          */
         interface WithBandwidthInMbps {
             /**
              * Specifies bandwidthInMbps.
-             * @param bandwidthInMbps The circuit bandwidth In Mbps
-             * @return the next update stage
              */
             Update withBandwidthInMbps(Integer bandwidthInMbps);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ExpressRouteCircuit.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ExpressRouteCircuit.
          */
         interface WithExpressRouteCircuit {
             /**
              * Specifies expressRouteCircuit.
-             * @param expressRouteCircuit The ExpressRouteCircuit
-             * @return the next update stage
              */
             Update withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify PeeringLocation.
+         * The stage of the expressroutecrossconnection {0} allowing to specify PeeringLocation.
          */
         interface WithPeeringLocation {
             /**
              * Specifies peeringLocation.
-             * @param peeringLocation The peering location of the ExpressRoute circuit
-             * @return the next update stage
              */
             Update withPeeringLocation(String peeringLocation);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify Peerings.
+         * The stage of the expressroutecrossconnection {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
-             * @return the next update stage
              */
             Update withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next update stage
              */
             Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnectionPeering.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnectionPeering.java
index 155b5ecbeafd..02b0042bf58d 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnectionPeering.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/ExpressRouteCrossConnectionPeering.java
@@ -134,9 +134,6 @@ interface Blank extends WithExpressRouteCrossConnection {
         interface WithExpressRouteCrossConnection {
            /**
             * Specifies resourceGroupName, crossConnectionName.
-            * @param resourceGroupName The name of the resource group
-            * @param crossConnectionName The name of the ExpressRouteCrossConnection
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCrossConnection(String resourceGroupName, String crossConnectionName);
         }
@@ -147,8 +144,6 @@ interface WithExpressRouteCrossConnection {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -159,8 +154,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -171,8 +164,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next definition stage
              */
             WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -183,8 +174,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next definition stage
              */
             WithCreate withLastModifiedBy(String lastModifiedBy);
         }
@@ -195,8 +184,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next definition stage
              */
             WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -207,8 +194,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -219,8 +204,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next definition stage
              */
             WithCreate withPeerASN(Long peerASN);
         }
@@ -231,8 +214,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next definition stage
              */
             WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -243,8 +224,6 @@ interface WithPeeringType {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next definition stage
              */
             WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -255,8 +234,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next definition stage
              */
             WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -267,8 +244,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -279,8 +254,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next definition stage
              */
             WithCreate withState(ExpressRoutePeeringState state);
         }
@@ -291,8 +264,6 @@ interface WithState {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next definition stage
              */
             WithCreate withVlanId(Integer vlanId);
         }
@@ -321,8 +292,6 @@ interface UpdateStages {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -333,8 +302,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -345,8 +312,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next update stage
              */
             Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -357,8 +322,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next update stage
              */
             Update withLastModifiedBy(String lastModifiedBy);
         }
@@ -369,8 +332,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next update stage
              */
             Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -381,8 +342,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -393,8 +352,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next update stage
              */
             Update withPeerASN(Long peerASN);
         }
@@ -405,8 +362,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next update stage
              */
             Update withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -417,8 +372,6 @@ interface WithPeeringType {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next update stage
              */
             Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -429,8 +382,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next update stage
              */
             Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -441,8 +392,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -453,8 +402,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next update stage
              */
             Update withState(ExpressRoutePeeringState state);
         }
@@ -465,8 +412,6 @@ interface WithState {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next update stage
              */
             Update withVlanId(Integer vlanId);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/InboundNatRule.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/InboundNatRule.java
index 12b0eb535065..197ff753cfb1 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/InboundNatRule.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/InboundNatRule.java
@@ -100,9 +100,6 @@ interface Blank extends WithLoadBalancer {
         interface WithLoadBalancer {
            /**
             * Specifies resourceGroupName, loadBalancerName.
-            * @param resourceGroupName The name of the resource group
-            * @param loadBalancerName The name of the load balancer
-            * @return the next definition stage
             */
             WithCreate withExistingLoadBalancer(String resourceGroupName, String loadBalancerName);
         }
@@ -113,8 +110,6 @@ interface WithLoadBalancer {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next definition stage
              */
             WithCreate withBackendPort(Integer backendPort);
         }
@@ -125,8 +120,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next definition stage
              */
             WithCreate withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -137,8 +130,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -149,8 +140,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -161,8 +150,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next definition stage
              */
             WithCreate withFrontendPort(Integer frontendPort);
         }
@@ -173,8 +160,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -185,8 +170,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -197,8 +180,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -209,8 +190,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next definition stage
              */
             WithCreate withProtocol(TransportProtocol protocol);
         }
@@ -221,8 +200,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -251,8 +228,6 @@ interface UpdateStages {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next update stage
              */
             Update withBackendPort(Integer backendPort);
         }
@@ -263,8 +238,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next update stage
              */
             Update withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -275,8 +248,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -287,8 +258,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next update stage
              */
             Update withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -299,8 +268,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next update stage
              */
             Update withFrontendPort(Integer frontendPort);
         }
@@ -311,8 +278,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -335,8 +298,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -347,8 +308,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next update stage
              */
             Update withProtocol(TransportProtocol protocol);
         }
@@ -359,8 +318,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LoadBalancer.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LoadBalancer.java
index 176bcfe844af..6ceb1c958969 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LoadBalancer.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LoadBalancer.java
@@ -108,133 +108,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Etag.
+         * The stage of the loadbalancer update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatPools.
+         * The stage of the loadbalancer update allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatRules.
+         * The stage of the loadbalancer update allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next definition stage
              */
             WithCreate withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Probes.
+         * The stage of the loadbalancer update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ProvisioningState.
+         * The stage of the loadbalancer update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ResourceGuid.
+         * The stage of the loadbalancer update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Sku.
+         * The stage of the loadbalancer update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next definition stage
              */
             WithCreate withSku(LoadBalancerSku sku);
         }
@@ -258,133 +236,111 @@ interface Update extends Appliable<LoadBalancer>, Resource.UpdateWithTags<Update
      */
     interface UpdateStages {
         /**
-         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Etag.
+         * The stage of the loadbalancer {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatPools.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer {0} allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next update stage
              */
             Update withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next update stage
              */
             Update withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Probes.
+         * The stage of the loadbalancer {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next update stage
              */
             Update withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ProvisioningState.
+         * The stage of the loadbalancer {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ResourceGuid.
+         * The stage of the loadbalancer {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Sku.
+         * The stage of the loadbalancer {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next update stage
              */
             Update withSku(LoadBalancerSku sku);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LocalNetworkGateway.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LocalNetworkGateway.java
index bd18758973d0..bb1306684c6f 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LocalNetworkGateway.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/LocalNetworkGateway.java
@@ -77,61 +77,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify Etag.
+         * The stage of the localnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next definition stage
              */
             WithCreate withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
@@ -155,61 +145,51 @@ interface Update extends Appliable<LocalNetworkGateway>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify Etag.
+         * The stage of the localnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway {0} allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next update stage
              */
             Update withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway {0} allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next update stage
              */
             Update withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkInterface.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkInterface.java
index e13c8630fba9..d7d0489b5026 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkInterface.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkInterface.java
@@ -106,133 +106,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify DnsSettings.
+         * The stage of the networkinterface update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next definition stage
              */
             WithCreate withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next definition stage
              */
             WithCreate withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Etag.
+         * The stage of the networkinterface update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify IpConfigurations.
+         * The stage of the networkinterface update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify MacAddress.
+         * The stage of the networkinterface update allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next definition stage
              */
             WithCreate withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Primary.
+         * The stage of the networkinterface update allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next definition stage
              */
             WithCreate withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ProvisioningState.
+         * The stage of the networkinterface update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ResourceGuid.
+         * The stage of the networkinterface update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify VirtualMachine.
+         * The stage of the networkinterface update allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next definition stage
              */
             WithCreate withVirtualMachine(SubResource virtualMachine);
         }
@@ -256,133 +234,111 @@ interface Update extends Appliable<NetworkInterface>, Resource.UpdateWithTags<Up
      */
     interface UpdateStages {
         /**
-         * The stage of the networkinterface update allowing to specify DnsSettings.
+         * The stage of the networkinterface {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next update stage
              */
             Update withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface {0} allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next update stage
              */
             Update withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface {0} allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next update stage
              */
             Update withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Etag.
+         * The stage of the networkinterface {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify IpConfigurations.
+         * The stage of the networkinterface {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next update stage
              */
             Update withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify MacAddress.
+         * The stage of the networkinterface {0} allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next update stage
              */
             Update withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface {0} allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Primary.
+         * The stage of the networkinterface {0} allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next update stage
              */
             Update withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ProvisioningState.
+         * The stage of the networkinterface {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ResourceGuid.
+         * The stage of the networkinterface {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify VirtualMachine.
+         * The stage of the networkinterface {0} allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next update stage
              */
             Update withVirtualMachine(SubResource virtualMachine);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroup.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroup.java
index ec5466b5de37..1c88afbe370a 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroup.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroup.java
@@ -84,61 +84,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next definition stage
              */
             WithCreate withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify Etag.
+         * The stage of the networksecuritygroup update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next definition stage
              */
             WithCreate withSecurityRules(List<SecurityRuleInner> securityRules);
         }
@@ -162,61 +152,51 @@ interface Update extends Appliable<NetworkSecurityGroup>, Resource.UpdateWithTag
      */
     interface UpdateStages {
         /**
-         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next update stage
              */
             Update withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify Etag.
+         * The stage of the networksecuritygroup {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next update stage
              */
             Update withSecurityRules(List<SecurityRuleInner> securityRules);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java
index 42f7c9e9524b..2fc7b13fcdb7 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkSecurityGroupSecurityRule.java
@@ -141,9 +141,6 @@ interface Blank extends WithNetworkSecurityGroup {
         interface WithNetworkSecurityGroup {
            /**
             * Specifies resourceGroupName, networkSecurityGroupName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkSecurityGroupName The name of the network security group
-            * @return the next definition stage
             */
             WithAccess withExistingNetworkSecurityGroup(String resourceGroupName, String networkSecurityGroupName);
         }
@@ -154,8 +151,6 @@ interface WithNetworkSecurityGroup {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The network traffic is allowed or denied. Possible values are: 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithDirection withAccess(SecurityRuleAccess access);
         }
@@ -166,8 +161,6 @@ interface WithAccess {
         interface WithDirection {
            /**
             * Specifies direction.
-            * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound'
-            * @return the next definition stage
             */
             WithProtocol withDirection(SecurityRuleDirection direction);
         }
@@ -178,8 +171,6 @@ interface WithDirection {
         interface WithProtocol {
            /**
             * Specifies protocol.
-            * @param protocol Network protocol this rule applies to. Possible values are 'Tcp', 'Udp', and '*'. Possible values include: 'Tcp', 'Udp', '*'
-            * @return the next definition stage
             */
             WithCreate withProtocol(SecurityRuleProtocol protocol);
         }
@@ -190,8 +181,6 @@ interface WithProtocol {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next definition stage
              */
             WithCreate withDescription(String description);
         }
@@ -202,8 +191,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -214,8 +201,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -226,8 +211,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next definition stage
              */
             WithCreate withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -238,8 +221,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRange(String destinationPortRange);
         }
@@ -250,8 +231,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -262,8 +241,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -274,8 +251,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -286,8 +261,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -298,8 +271,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next definition stage
              */
             WithCreate withPriority(Integer priority);
         }
@@ -310,8 +281,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -322,8 +291,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -334,8 +301,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -346,8 +311,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next definition stage
              */
             WithCreate withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -358,8 +321,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withSourcePortRange(String sourcePortRange);
         }
@@ -370,8 +331,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next definition stage
              */
             WithCreate withSourcePortRanges(List<String> sourcePortRanges);
         }
@@ -400,8 +359,6 @@ interface UpdateStages {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next update stage
              */
             Update withDescription(String description);
         }
@@ -412,8 +369,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next update stage
              */
             Update withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -424,8 +379,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next update stage
              */
             Update withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -436,8 +389,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next update stage
              */
             Update withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -448,8 +399,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withDestinationPortRange(String destinationPortRange);
         }
@@ -460,8 +409,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next update stage
              */
             Update withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -472,8 +419,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -484,8 +429,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -496,8 +439,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -508,8 +449,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next update stage
              */
             Update withPriority(Integer priority);
         }
@@ -520,8 +459,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -532,8 +469,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next update stage
              */
             Update withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -544,8 +479,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next update stage
              */
             Update withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -556,8 +489,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next update stage
              */
             Update withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -568,8 +499,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withSourcePortRange(String sourcePortRange);
         }
@@ -580,8 +509,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next update stage
              */
             Update withSourcePortRanges(List<String> sourcePortRanges);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkWatcher.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkWatcher.java
index 5eb5900f1b20..0a44387bdbb8 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkWatcher.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/NetworkWatcher.java
@@ -57,13 +57,11 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkwatcher definition allowing to specify Etag.
+         * The stage of the networkwatcher update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -87,13 +85,11 @@ interface Update extends Appliable<NetworkWatcher>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the networkwatcher update allowing to specify Etag.
+         * The stage of the networkwatcher {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PacketCaptureResult.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PacketCaptureResult.java
index 2fd9d38aabd5..b27b9d29e6e4 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PacketCaptureResult.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PacketCaptureResult.java
@@ -95,9 +95,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkWatcherName The name of the network watcher
-            * @return the next definition stage
             */
             WithStorageLocation withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -108,8 +105,6 @@ interface WithNetworkWatcher {
         interface WithStorageLocation {
            /**
             * Specifies storageLocation.
-            * @param storageLocation the storageLocation parameter value
-            * @return the next definition stage
             */
             WithTarget withStorageLocation(PacketCaptureStorageLocation storageLocation);
         }
@@ -120,8 +115,6 @@ interface WithStorageLocation {
         interface WithTarget {
            /**
             * Specifies target.
-            * @param target The ID of the targeted resource, only VM is currently supported
-            * @return the next definition stage
             */
             WithCreate withTarget(String target);
         }
@@ -132,8 +125,6 @@ interface WithTarget {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next definition stage
              */
             WithCreate withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -144,8 +135,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next definition stage
              */
             WithCreate withFilters(List<PacketCaptureFilter> filters);
         }
@@ -156,8 +145,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next definition stage
              */
             WithCreate withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -168,8 +155,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next definition stage
              */
             WithCreate withTotalBytesPerSession(Integer totalBytesPerSession);
         }
@@ -198,8 +183,6 @@ interface UpdateStages {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next update stage
              */
             Update withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -210,8 +193,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next update stage
              */
             Update withFilters(List<PacketCaptureFilter> filters);
         }
@@ -222,8 +203,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next update stage
              */
             Update withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -234,8 +213,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next update stage
              */
             Update withTotalBytesPerSession(Integer totalBytesPerSession);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PublicIPAddress.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PublicIPAddress.java
index ea596c1b59af..9350b854c3c0 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PublicIPAddress.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/PublicIPAddress.java
@@ -108,133 +108,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify DnsSettings.
+         * The stage of the publicipaddress update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Etag.
+         * The stage of the publicipaddress update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IpAddress.
+         * The stage of the publicipaddress update allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next definition stage
              */
             WithCreate withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IpTags.
+         * The stage of the publicipaddress update allowing to specify IpTags.
          */
         interface WithIpTags {
             /**
              * Specifies ipTags.
-             * @param ipTags The list of tags associated with the public IP address
-             * @return the next definition stage
              */
             WithCreate withIpTags(List<IpTag> ipTags);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ProvisioningState.
+         * The stage of the publicipaddress update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ResourceGuid.
+         * The stage of the publicipaddress update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Sku.
+         * The stage of the publicipaddress update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next definition stage
              */
             WithCreate withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Zones.
+         * The stage of the publicipaddress update allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -258,133 +236,111 @@ interface Update extends Appliable<PublicIPAddress>, Resource.UpdateWithTags<Upd
      */
     interface UpdateStages {
         /**
-         * The stage of the publicipaddress update allowing to specify DnsSettings.
+         * The stage of the publicipaddress {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next update stage
              */
             Update withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Etag.
+         * The stage of the publicipaddress {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress {0} allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IpAddress.
+         * The stage of the publicipaddress {0} allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next update stage
              */
             Update withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IpTags.
+         * The stage of the publicipaddress {0} allowing to specify IpTags.
          */
         interface WithIpTags {
             /**
              * Specifies ipTags.
-             * @param ipTags The list of tags associated with the public IP address
-             * @return the next update stage
              */
             Update withIpTags(List<IpTag> ipTags);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ProvisioningState.
+         * The stage of the publicipaddress {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next update stage
              */
             Update withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next update stage
              */
             Update withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ResourceGuid.
+         * The stage of the publicipaddress {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Sku.
+         * The stage of the publicipaddress {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next update stage
              */
             Update withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Zones.
+         * The stage of the publicipaddress {0} allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next update stage
              */
             Update withZones(List<String> zones);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Route.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Route.java
index a1f3e81a3385..e4cc6be1dc9d 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Route.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Route.java
@@ -79,9 +79,6 @@ interface Blank extends WithRouteTable {
         interface WithRouteTable {
            /**
             * Specifies resourceGroupName, routeTableName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeTableName The name of the route table
-            * @return the next definition stage
             */
             WithNextHopType withExistingRouteTable(String resourceGroupName, String routeTableName);
         }
@@ -92,8 +89,6 @@ interface WithRouteTable {
         interface WithNextHopType {
            /**
             * Specifies nextHopType.
-            * @param nextHopType The type of Azure hop the packet should be sent to. Possible values are: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', and 'None'. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'
-            * @return the next definition stage
             */
             WithCreate withNextHopType(RouteNextHopType nextHopType);
         }
@@ -104,8 +99,6 @@ interface WithNextHopType {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -116,8 +109,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -128,8 +119,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -140,8 +129,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -152,8 +139,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next definition stage
              */
             WithCreate withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -164,8 +149,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -194,8 +177,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -206,8 +187,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -218,8 +197,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -230,8 +207,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -242,8 +217,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next update stage
              */
             Update withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -254,8 +227,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilter.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilter.java
index 892ea0979bed..5e1430f17b64 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilter.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilter.java
@@ -70,25 +70,21 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Peerings.
+         * The stage of the routefilter update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Rules.
+         * The stage of the routefilter update allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next definition stage
              */
             WithCreate withRules(List<RouteFilterRuleInner> rules);
         }
@@ -112,25 +108,21 @@ interface Update extends Appliable<RouteFilter>, Resource.UpdateWithTags<Update>
      */
     interface UpdateStages {
         /**
-         * The stage of the routefilter update allowing to specify Peerings.
+         * The stage of the routefilter {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter update allowing to specify Rules.
+         * The stage of the routefilter {0} allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next update stage
              */
             Update withRules(List<RouteFilterRuleInner> rules);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilterRule.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilterRule.java
index bafb7249867c..7890f88e8e8d 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilterRule.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteFilterRule.java
@@ -85,9 +85,6 @@ interface Blank extends WithRouteFilter {
         interface WithRouteFilter {
            /**
             * Specifies resourceGroupName, routeFilterName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeFilterName The name of the route filter
-            * @return the next definition stage
             */
             WithAccess withExistingRouteFilter(String resourceGroupName, String routeFilterName);
         }
@@ -98,8 +95,6 @@ interface WithRouteFilter {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The access type of the rule. Valid values are: 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithCommunities withAccess(Access access);
         }
@@ -110,8 +105,6 @@ interface WithAccess {
         interface WithCommunities {
            /**
             * Specifies communities.
-            * @param communities The collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020']
-            * @return the next definition stage
             */
             WithRouteFilterRuleType withCommunities(List<String> communities);
         }
@@ -122,8 +115,6 @@ interface WithCommunities {
         interface WithRouteFilterRuleType {
            /**
             * Specifies routeFilterRuleType.
-            * @param routeFilterRuleType The rule type of the rule. Valid value is: 'Community'
-            * @return the next definition stage
             */
             WithCreate withRouteFilterRuleType(String routeFilterRuleType);
         }
@@ -134,8 +125,6 @@ interface WithRouteFilterRuleType {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -146,8 +135,6 @@ interface WithId {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -158,8 +145,6 @@ interface WithLocation {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -188,8 +173,6 @@ interface UpdateStages {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteTable.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteTable.java
index 607107582230..5159b100d343 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteTable.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/RouteTable.java
@@ -74,49 +74,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routetable definition allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next definition stage
              */
             WithCreate withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Etag.
+         * The stage of the routetable update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify ProvisioningState.
+         * The stage of the routetable update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Routes.
+         * The stage of the routetable update allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next definition stage
              */
             WithCreate withRoutes(List<RouteInner> routes);
         }
@@ -140,49 +132,41 @@ interface Update extends Appliable<RouteTable>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable {0} allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next update stage
              */
             Update withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Etag.
+         * The stage of the routetable {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable update allowing to specify ProvisioningState.
+         * The stage of the routetable {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Routes.
+         * The stage of the routetable {0} allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next update stage
              */
             Update withRoutes(List<RouteInner> routes);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Subnet.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Subnet.java
index d960bbf3e257..f93739b8d71f 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Subnet.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/Subnet.java
@@ -97,9 +97,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -110,8 +107,6 @@ interface WithVirtualNetwork {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -122,8 +117,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -134,8 +127,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -146,8 +137,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -158,8 +147,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -170,8 +157,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -182,8 +167,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next definition stage
              */
             WithCreate withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -194,8 +177,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next definition stage
              */
             WithCreate withRouteTable(RouteTableInner routeTable);
         }
@@ -206,8 +187,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next definition stage
              */
             WithCreate withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
@@ -236,8 +215,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -248,8 +225,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -260,8 +235,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -272,8 +245,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -284,8 +255,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -296,8 +265,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -308,8 +275,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next update stage
              */
             Update withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -320,8 +285,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next update stage
              */
             Update withRouteTable(RouteTableInner routeTable);
         }
@@ -332,8 +295,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next update stage
              */
             Update withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualHub.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualHub.java
index 6bd9e89d208d..f007d0f232cb 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualHub.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualHub.java
@@ -75,49 +75,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify AddressPrefix.
+         * The stage of the virtualhub update allowing to specify AddressPrefix.
          */
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix Address-prefix for this VirtualHub
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify HubVirtualNetworkConnections.
+         * The stage of the virtualhub update allowing to specify HubVirtualNetworkConnections.
          */
         interface WithHubVirtualNetworkConnections {
             /**
              * Specifies hubVirtualNetworkConnections.
-             * @param hubVirtualNetworkConnections list of all vnet connections with this VirtualHub
-             * @return the next definition stage
              */
             WithCreate withHubVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> hubVirtualNetworkConnections);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify ProvisioningState.
+         * The stage of the virtualhub update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify VirtualWan.
+         * The stage of the virtualhub update allowing to specify VirtualWan.
          */
         interface WithVirtualWan {
             /**
              * Specifies virtualWan.
-             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualWan(SubResource virtualWan);
         }
@@ -141,49 +133,41 @@ interface Update extends Appliable<VirtualHub>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualhub update allowing to specify AddressPrefix.
+         * The stage of the virtualhub {0} allowing to specify AddressPrefix.
          */
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix Address-prefix for this VirtualHub
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify HubVirtualNetworkConnections.
+         * The stage of the virtualhub {0} allowing to specify HubVirtualNetworkConnections.
          */
         interface WithHubVirtualNetworkConnections {
             /**
              * Specifies hubVirtualNetworkConnections.
-             * @param hubVirtualNetworkConnections list of all vnet connections with this VirtualHub
-             * @return the next update stage
              */
             Update withHubVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> hubVirtualNetworkConnections);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify ProvisioningState.
+         * The stage of the virtualhub {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify VirtualWan.
+         * The stage of the virtualhub {0} allowing to specify VirtualWan.
          */
         interface WithVirtualWan {
             /**
              * Specifies virtualWan.
-             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
-             * @return the next update stage
              */
             Update withVirtualWan(SubResource virtualWan);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetwork.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetwork.java
index 96b621e82538..2b46042d58da 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetwork.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetwork.java
@@ -101,121 +101,101 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify AddressSpace.
+         * The stage of the virtualnetwork update allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next definition stage
              */
             WithCreate withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify DdosProtectionPlan.
+         * The stage of the virtualnetwork update allowing to specify DdosProtectionPlan.
          */
         interface WithDdosProtectionPlan {
             /**
              * Specifies ddosProtectionPlan.
-             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
-             * @return the next definition stage
              */
             WithCreate withDdosProtectionPlan(SubResource ddosProtectionPlan);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next definition stage
              */
             WithCreate withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
-             * @return the next definition stage
              */
             WithCreate withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
-             * @return the next definition stage
              */
             WithCreate withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Etag.
+         * The stage of the virtualnetwork update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Subnets.
+         * The stage of the virtualnetwork update allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
@@ -239,121 +219,101 @@ interface Update extends Appliable<VirtualNetwork>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetwork update allowing to specify AddressSpace.
+         * The stage of the virtualnetwork {0} allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next update stage
              */
             Update withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify DdosProtectionPlan.
+         * The stage of the virtualnetwork {0} allowing to specify DdosProtectionPlan.
          */
         interface WithDdosProtectionPlan {
             /**
              * Specifies ddosProtectionPlan.
-             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
-             * @return the next update stage
              */
             Update withDdosProtectionPlan(SubResource ddosProtectionPlan);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork {0} allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next update stage
              */
             Update withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
-             * @return the next update stage
              */
             Update withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
-             * @return the next update stage
              */
             Update withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Etag.
+         * The stage of the virtualnetwork {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Subnets.
+         * The stage of the virtualnetwork {0} allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next update stage
              */
             Update withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork {0} allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next update stage
              */
             Update withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGateway.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGateway.java
index 5824c282793d..f0dee68bb0f5 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGateway.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGateway.java
@@ -109,133 +109,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next definition stage
              */
             WithCreate withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Etag.
+         * The stage of the virtualnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next definition stage
              */
             WithCreate withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next definition stage
              */
             WithCreate withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Sku.
+         * The stage of the virtualnetworkgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next definition stage
              */
             WithCreate withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next definition stage
              */
             WithCreate withVpnType(VpnType vpnType);
         }
@@ -259,133 +237,111 @@ interface Update extends Appliable<VirtualNetworkGateway>, Resource.UpdateWithTa
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next update stage
              */
             Update withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Etag.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next update stage
              */
             Update withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next update stage
              */
             Update withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next update stage
              */
             Update withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Sku.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next update stage
              */
             Update withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next update stage
              */
             Update withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next update stage
              */
             Update withVpnType(VpnType vpnType);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java
index 6b46b31d31ce..5f10cc5b49cb 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkGatewayConnection.java
@@ -146,9 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithConnectionType {
            /**
             * Specifies connectionType.
-            * @param connectionType Gateway connection type. Possible values are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'
-            * @return the next definition stage
-*/
+            */
             WithVirtualNetworkGateway1 withConnectionType(VirtualNetworkGatewayConnectionType connectionType);
         }
 
@@ -158,140 +156,116 @@ interface WithConnectionType {
         interface WithVirtualNetworkGateway1 {
            /**
             * Specifies virtualNetworkGateway1.
-            * @param virtualNetworkGateway1 The reference to virtual network gateway resource
-            * @return the next definition stage
-*/
+            */
             WithCreate withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next definition stage
              */
             WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next definition stage
              */
             WithCreate withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next definition stage
              */
             WithCreate withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next definition stage
              */
             WithCreate withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
@@ -315,133 +289,111 @@ interface Update extends Appliable<VirtualNetworkGatewayConnection>, Resource.Up
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next update stage
              */
             Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next update stage
              */
             Update withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next update stage
              */
             Update withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next update stage
              */
             Update withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next update stage
              */
             Update withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next update stage
              */
             Update withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkPeering.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkPeering.java
index 62eff0f9b208..14069062fc16 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkPeering.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualNetworkPeering.java
@@ -100,9 +100,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -113,8 +110,6 @@ interface WithVirtualNetwork {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next definition stage
              */
             WithCreate withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -125,8 +120,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next definition stage
              */
             WithCreate withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -137,8 +130,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next definition stage
              */
             WithCreate withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -149,8 +140,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -161,8 +150,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -173,8 +160,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -185,8 +170,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next definition stage
              */
             WithCreate withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -197,8 +180,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -209,8 +190,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next definition stage
              */
             WithCreate withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -221,8 +200,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next definition stage
              */
             WithCreate withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -233,8 +210,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next definition stage
              */
             WithCreate withUseRemoteGateways(Boolean useRemoteGateways);
         }
@@ -263,8 +238,6 @@ interface UpdateStages {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next update stage
              */
             Update withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -275,8 +248,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next update stage
              */
             Update withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -287,8 +258,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next update stage
              */
             Update withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -299,8 +268,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -311,8 +278,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -335,8 +298,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next update stage
              */
             Update withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -347,8 +308,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -359,8 +318,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next update stage
              */
             Update withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -371,8 +328,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next update stage
              */
             Update withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -383,8 +338,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next update stage
              */
             Update withUseRemoteGateways(Boolean useRemoteGateways);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualWAN.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualWAN.java
index 5b70bd632ebd..49d90e13ab2e 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualWAN.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VirtualWAN.java
@@ -74,25 +74,21 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualwan definition allowing to specify DisableVpnEncryption.
+         * The stage of the virtualwan update allowing to specify DisableVpnEncryption.
          */
         interface WithDisableVpnEncryption {
             /**
              * Specifies disableVpnEncryption.
-             * @param disableVpnEncryption Vpn encryption to be disabled or not
-             * @return the next definition stage
              */
             WithCreate withDisableVpnEncryption(Boolean disableVpnEncryption);
         }
 
         /**
-         * The stage of the virtualwan definition allowing to specify ProvisioningState.
+         * The stage of the virtualwan update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -116,25 +112,21 @@ interface Update extends Appliable<VirtualWAN>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualwan update allowing to specify DisableVpnEncryption.
+         * The stage of the virtualwan {0} allowing to specify DisableVpnEncryption.
          */
         interface WithDisableVpnEncryption {
             /**
              * Specifies disableVpnEncryption.
-             * @param disableVpnEncryption Vpn encryption to be disabled or not
-             * @return the next update stage
              */
             Update withDisableVpnEncryption(Boolean disableVpnEncryption);
         }
 
         /**
-         * The stage of the virtualwan update allowing to specify ProvisioningState.
+         * The stage of the virtualwan {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnConnection.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnConnection.java
index e1bca670b1be..aaddc4fd5823 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnConnection.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnConnection.java
@@ -127,9 +127,6 @@ interface Blank extends WithVpnGateway {
         interface WithVpnGateway {
            /**
             * Specifies resourceGroupName, gatewayName.
-            * @param resourceGroupName The resource group name of the VpnGateway
-            * @param gatewayName The name of the gateway
-            * @return the next definition stage
             */
             WithCreate withExistingVpnGateway(String resourceGroupName, String gatewayName);
         }
@@ -140,8 +137,6 @@ interface WithVpnGateway {
         interface WithConnectionStatus {
             /**
              * Specifies connectionStatus.
-             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
-             * @return the next definition stage
              */
             WithCreate withConnectionStatus(VpnConnectionStatus connectionStatus);
         }
@@ -152,8 +147,6 @@ interface WithConnectionStatus {
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
@@ -164,8 +157,6 @@ interface WithEnableBgp {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -176,8 +167,6 @@ interface WithId {
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next definition stage
              */
             WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
@@ -188,8 +177,6 @@ interface WithIpsecPolicies {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -200,8 +187,6 @@ interface WithLocation {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -212,8 +197,6 @@ interface WithProvisioningState {
         interface WithRemoteVpnSite {
             /**
              * Specifies remoteVpnSite.
-             * @param remoteVpnSite Id of the connected vpn site
-             * @return the next definition stage
              */
             WithCreate withRemoteVpnSite(SubResource remoteVpnSite);
         }
@@ -224,8 +207,6 @@ interface WithRemoteVpnSite {
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight routing weight for vpn connection
-             * @return the next definition stage
              */
             WithCreate withRoutingWeight(Integer routingWeight);
         }
@@ -236,8 +217,6 @@ interface WithRoutingWeight {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey SharedKey for the vpn connection
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -248,8 +227,6 @@ interface WithSharedKey {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -278,8 +255,6 @@ interface UpdateStages {
         interface WithConnectionStatus {
             /**
              * Specifies connectionStatus.
-             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
-             * @return the next update stage
              */
             Update withConnectionStatus(VpnConnectionStatus connectionStatus);
         }
@@ -290,8 +265,6 @@ interface WithConnectionStatus {
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
@@ -302,8 +275,6 @@ interface WithEnableBgp {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -314,8 +285,6 @@ interface WithId {
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next update stage
              */
             Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
@@ -326,8 +295,6 @@ interface WithIpsecPolicies {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next update stage
              */
             Update withLocation(String location);
         }
@@ -338,8 +305,6 @@ interface WithLocation {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
@@ -350,8 +315,6 @@ interface WithProvisioningState {
         interface WithRemoteVpnSite {
             /**
              * Specifies remoteVpnSite.
-             * @param remoteVpnSite Id of the connected vpn site
-             * @return the next update stage
              */
             Update withRemoteVpnSite(SubResource remoteVpnSite);
         }
@@ -362,8 +325,6 @@ interface WithRemoteVpnSite {
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight routing weight for vpn connection
-             * @return the next update stage
              */
             Update withRoutingWeight(Integer routingWeight);
         }
@@ -374,8 +335,6 @@ interface WithRoutingWeight {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey SharedKey for the vpn connection
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -386,8 +345,6 @@ interface WithSharedKey {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnGateway.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnGateway.java
index 66f77ca961f6..fe920223d2f2 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnGateway.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnGateway.java
@@ -80,61 +80,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify BgpSettings.
+         * The stage of the vpngateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify Connections.
+         * The stage of the vpngateway update allowing to specify Connections.
          */
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections list of all vpn connections to the gateway
-             * @return the next definition stage
              */
             WithCreate withConnections(List<VpnConnectionInner> connections);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify Policies.
+         * The stage of the vpngateway update allowing to specify Policies.
          */
         interface WithPolicies {
             /**
              * Specifies policies.
-             * @param policies The policies applied to this vpn gateway
-             * @return the next definition stage
              */
             WithCreate withPolicies(Policies policies);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify ProvisioningState.
+         * The stage of the vpngateway update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify VirtualHub.
+         * The stage of the vpngateway update allowing to specify VirtualHub.
          */
         interface WithVirtualHub {
             /**
              * Specifies virtualHub.
-             * @param virtualHub The VirtualHub to which the gateway belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualHub(SubResource virtualHub);
         }
@@ -158,61 +148,51 @@ interface Update extends Appliable<VpnGateway>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the vpngateway update allowing to specify BgpSettings.
+         * The stage of the vpngateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify Connections.
+         * The stage of the vpngateway {0} allowing to specify Connections.
          */
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections list of all vpn connections to the gateway
-             * @return the next update stage
              */
             Update withConnections(List<VpnConnectionInner> connections);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify Policies.
+         * The stage of the vpngateway {0} allowing to specify Policies.
          */
         interface WithPolicies {
             /**
              * Specifies policies.
-             * @param policies The policies applied to this vpn gateway
-             * @return the next update stage
              */
             Update withPolicies(Policies policies);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify ProvisioningState.
+         * The stage of the vpngateway {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify VirtualHub.
+         * The stage of the vpngateway {0} allowing to specify VirtualHub.
          */
         interface WithVirtualHub {
             /**
              * Specifies virtualHub.
-             * @param virtualHub The VirtualHub to which the gateway belongs
-             * @return the next update stage
              */
             Update withVirtualHub(SubResource virtualHub);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnSite.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnSite.java
index f838015ca564..071abeca0f0b 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnSite.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/VpnSite.java
@@ -88,85 +88,71 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify AddressSpace.
+         * The stage of the vpnsite update allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges
-             * @return the next definition stage
              */
             WithCreate withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify BgpProperties.
+         * The stage of the vpnsite update allowing to specify BgpProperties.
          */
         interface WithBgpProperties {
             /**
              * Specifies bgpProperties.
-             * @param bgpProperties The set of bgp properties
-             * @return the next definition stage
              */
             WithCreate withBgpProperties(BgpSettings bgpProperties);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify DeviceProperties.
+         * The stage of the vpnsite update allowing to specify DeviceProperties.
          */
         interface WithDeviceProperties {
             /**
              * Specifies deviceProperties.
-             * @param deviceProperties The device properties
-             * @return the next definition stage
              */
             WithCreate withDeviceProperties(DeviceProperties deviceProperties);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify IpAddress.
+         * The stage of the vpnsite update allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The ip-address for the vpn-site
-             * @return the next definition stage
              */
             WithCreate withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify ProvisioningState.
+         * The stage of the vpnsite update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify SiteKey.
+         * The stage of the vpnsite update allowing to specify SiteKey.
          */
         interface WithSiteKey {
             /**
              * Specifies siteKey.
-             * @param siteKey The key for vpn-site that can be used for connections
-             * @return the next definition stage
              */
             WithCreate withSiteKey(String siteKey);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify VirtualWAN.
+         * The stage of the vpnsite update allowing to specify VirtualWAN.
          */
         interface WithVirtualWAN {
             /**
              * Specifies virtualWAN.
-             * @param virtualWAN The VirtualWAN to which the vpnSite belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualWAN(SubResource virtualWAN);
         }
@@ -190,85 +176,71 @@ interface Update extends Appliable<VpnSite>, Resource.UpdateWithTags<Update>, Up
      */
     interface UpdateStages {
         /**
-         * The stage of the vpnsite update allowing to specify AddressSpace.
+         * The stage of the vpnsite {0} allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges
-             * @return the next update stage
              */
             Update withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify BgpProperties.
+         * The stage of the vpnsite {0} allowing to specify BgpProperties.
          */
         interface WithBgpProperties {
             /**
              * Specifies bgpProperties.
-             * @param bgpProperties The set of bgp properties
-             * @return the next update stage
              */
             Update withBgpProperties(BgpSettings bgpProperties);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify DeviceProperties.
+         * The stage of the vpnsite {0} allowing to specify DeviceProperties.
          */
         interface WithDeviceProperties {
             /**
              * Specifies deviceProperties.
-             * @param deviceProperties The device properties
-             * @return the next update stage
              */
             Update withDeviceProperties(DeviceProperties deviceProperties);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify IpAddress.
+         * The stage of the vpnsite {0} allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The ip-address for the vpn-site
-             * @return the next update stage
              */
             Update withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify ProvisioningState.
+         * The stage of the vpnsite {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify SiteKey.
+         * The stage of the vpnsite {0} allowing to specify SiteKey.
          */
         interface WithSiteKey {
             /**
              * Specifies siteKey.
-             * @param siteKey The key for vpn-site that can be used for connections
-             * @return the next update stage
              */
             Update withSiteKey(String siteKey);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify VirtualWAN.
+         * The stage of the vpnsite {0} allowing to specify VirtualWAN.
          */
         interface WithVirtualWAN {
             /**
              * Specifies virtualWAN.
-             * @param virtualWAN The VirtualWAN to which the vpnSite belongs
-             * @return the next update stage
              */
             Update withVirtualWAN(SubResource virtualWAN);
         }
diff --git a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/NetworkManagementClientImpl.java b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/NetworkManagementClientImpl.java
index f8ed6e248b37..7cd4db9a3c9d 100644
--- a/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/NetworkManagementClientImpl.java
+++ b/network/resource-manager/v2018_04_01/src/main/java/com/microsoft/azure/management/network/v2018_04_01/implementation/NetworkManagementClientImpl.java
@@ -68,11 +68,11 @@ public NetworkManagementClientImpl withSubscriptionId(String subscriptionId) {
         return this;
     }
 
-    /** The preferred language for the response. */
+    /** Gets or sets the preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets The preferred language for the response.
+     * Gets Gets or sets the preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -81,7 +81,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets The preferred language for the response.
+     * Sets Gets or sets the preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -91,11 +91,11 @@ public NetworkManagementClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
     private int longRunningOperationRetryTimeout;
 
     /**
-     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -104,7 +104,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -114,11 +114,11 @@ public NetworkManagementClientImpl withLongRunningOperationRetryTimeout(int long
         return this;
     }
 
-    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
     private boolean generateClientRequestId;
 
     /**
-     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @return the generateClientRequestId value.
      */
@@ -127,7 +127,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -868,7 +868,7 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "NetworkManagementClient", "2018-04-01");
+        return String.format("%s (%s)", super.userAgent(), "NetworkManagementClient");
     }
 
     private void initializeService() {
diff --git a/network/resource-manager/v2018_06_01/pom.xml b/network/resource-manager/v2018_06_01/pom.xml
index 0e24503cb10d..3f4d33385d81 100644
--- a/network/resource-manager/v2018_06_01/pom.xml
+++ b/network/resource-manager/v2018_06_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.network.v2018_06_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-network</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Network Management</name>
-    <description>This package contains Microsoft Network Management SDK.</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.network.v2018_06_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-network</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Network Management</name>
+    <description>This package contains Microsoft Network Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGateway.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGateway.java
index b9201cb6519e..8be2fe0e81f7 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGateway.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ApplicationGateway.java
@@ -163,265 +163,221 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify AutoscaleConfiguration.
+         * The stage of the applicationgateway update allowing to specify AutoscaleConfiguration.
          */
         interface WithAutoscaleConfiguration {
             /**
              * Specifies autoscaleConfiguration.
-             * @param autoscaleConfiguration Autoscale Configuration
-             * @return the next definition stage
              */
             WithCreate withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify EnableFips.
+         * The stage of the applicationgateway update allowing to specify EnableFips.
          */
         interface WithEnableFips {
             /**
              * Specifies enableFips.
-             * @param enableFips Whether FIPS is enabled on the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withEnableFips(Boolean enableFips);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify EnableHttp2.
+         * The stage of the applicationgateway update allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Etag.
+         * The stage of the applicationgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify FrontendPorts.
+         * The stage of the applicationgateway update allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next definition stage
              */
             WithCreate withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify HttpListeners.
+         * The stage of the applicationgateway update allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Probes.
+         * The stage of the applicationgateway update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ProvisioningState.
+         * The stage of the applicationgateway update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify ResourceGuid.
+         * The stage of the applicationgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Sku.
+         * The stage of the applicationgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslCertificates.
+         * The stage of the applicationgateway update allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify SslPolicy.
+         * The stage of the applicationgateway update allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next definition stage
              */
             WithCreate withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next definition stage
              */
             WithCreate withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway definition allowing to specify Zones.
+         * The stage of the applicationgateway update allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting where the resource needs to come from
-             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -445,265 +401,221 @@ interface Update extends Appliable<ApplicationGateway>, Resource.UpdateWithTags<
      */
     interface UpdateStages {
         /**
-         * The stage of the applicationgateway update allowing to specify AuthenticationCertificates.
+         * The stage of the applicationgateway {0} allowing to specify AuthenticationCertificates.
          */
         interface WithAuthenticationCertificates {
             /**
              * Specifies authenticationCertificates.
-             * @param authenticationCertificates Authentication certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withAuthenticationCertificates(List<ApplicationGatewayAuthenticationCertificate> authenticationCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify AutoscaleConfiguration.
+         * The stage of the applicationgateway {0} allowing to specify AutoscaleConfiguration.
          */
         interface WithAutoscaleConfiguration {
             /**
              * Specifies autoscaleConfiguration.
-             * @param autoscaleConfiguration Autoscale Configuration
-             * @return the next update stage
              */
             Update withAutoscaleConfiguration(ApplicationGatewayAutoscaleConfiguration autoscaleConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendAddressPools.
+         * The stage of the applicationgateway {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Backend address pool of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<ApplicationGatewayBackendAddressPool> backendAddressPools);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify BackendHttpSettingsCollection.
+         * The stage of the applicationgateway {0} allowing to specify BackendHttpSettingsCollection.
          */
         interface WithBackendHttpSettingsCollection {
             /**
              * Specifies backendHttpSettingsCollection.
-             * @param backendHttpSettingsCollection Backend http settings of the application gateway resource
-             * @return the next update stage
              */
             Update withBackendHttpSettingsCollection(List<ApplicationGatewayBackendHttpSettings> backendHttpSettingsCollection);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify EnableFips.
+         * The stage of the applicationgateway {0} allowing to specify EnableFips.
          */
         interface WithEnableFips {
             /**
              * Specifies enableFips.
-             * @param enableFips Whether FIPS is enabled on the application gateway resource
-             * @return the next update stage
              */
             Update withEnableFips(Boolean enableFips);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify EnableHttp2.
+         * The stage of the applicationgateway {0} allowing to specify EnableHttp2.
          */
         interface WithEnableHttp2 {
             /**
              * Specifies enableHttp2.
-             * @param enableHttp2 Whether HTTP2 is enabled on the application gateway resource
-             * @return the next update stage
              */
             Update withEnableHttp2(Boolean enableHttp2);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Etag.
+         * The stage of the applicationgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Frontend IP addresses of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<ApplicationGatewayFrontendIPConfiguration> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify FrontendPorts.
+         * The stage of the applicationgateway {0} allowing to specify FrontendPorts.
          */
         interface WithFrontendPorts {
             /**
              * Specifies frontendPorts.
-             * @param frontendPorts Frontend ports of the application gateway resource
-             * @return the next update stage
              */
             Update withFrontendPorts(List<ApplicationGatewayFrontendPort> frontendPorts);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify GatewayIPConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify GatewayIPConfigurations.
          */
         interface WithGatewayIPConfigurations {
             /**
              * Specifies gatewayIPConfigurations.
-             * @param gatewayIPConfigurations Subnets of application the gateway resource
-             * @return the next update stage
              */
             Update withGatewayIPConfigurations(List<ApplicationGatewayIPConfiguration> gatewayIPConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify HttpListeners.
+         * The stage of the applicationgateway {0} allowing to specify HttpListeners.
          */
         interface WithHttpListeners {
             /**
              * Specifies httpListeners.
-             * @param httpListeners Http listeners of the application gateway resource
-             * @return the next update stage
              */
             Update withHttpListeners(List<ApplicationGatewayHttpListener> httpListeners);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Probes.
+         * The stage of the applicationgateway {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Probes of the application gateway resource
-             * @return the next update stage
              */
             Update withProbes(List<ApplicationGatewayProbe> probes);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ProvisioningState.
+         * The stage of the applicationgateway {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RedirectConfigurations.
+         * The stage of the applicationgateway {0} allowing to specify RedirectConfigurations.
          */
         interface WithRedirectConfigurations {
             /**
              * Specifies redirectConfigurations.
-             * @param redirectConfigurations Redirect configurations of the application gateway resource
-             * @return the next update stage
              */
             Update withRedirectConfigurations(List<ApplicationGatewayRedirectConfiguration> redirectConfigurations);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify RequestRoutingRules.
+         * The stage of the applicationgateway {0} allowing to specify RequestRoutingRules.
          */
         interface WithRequestRoutingRules {
             /**
              * Specifies requestRoutingRules.
-             * @param requestRoutingRules Request routing rules of the application gateway resource
-             * @return the next update stage
              */
             Update withRequestRoutingRules(List<ApplicationGatewayRequestRoutingRule> requestRoutingRules);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify ResourceGuid.
+         * The stage of the applicationgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid Resource GUID property of the application gateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Sku.
+         * The stage of the applicationgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku SKU of the application gateway resource
-             * @return the next update stage
              */
             Update withSku(ApplicationGatewaySku sku);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslCertificates.
+         * The stage of the applicationgateway {0} allowing to specify SslCertificates.
          */
         interface WithSslCertificates {
             /**
              * Specifies sslCertificates.
-             * @param sslCertificates SSL certificates of the application gateway resource
-             * @return the next update stage
              */
             Update withSslCertificates(List<ApplicationGatewaySslCertificate> sslCertificates);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify SslPolicy.
+         * The stage of the applicationgateway {0} allowing to specify SslPolicy.
          */
         interface WithSslPolicy {
             /**
              * Specifies sslPolicy.
-             * @param sslPolicy SSL policy of the application gateway resource
-             * @return the next update stage
              */
             Update withSslPolicy(ApplicationGatewaySslPolicy sslPolicy);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify UrlPathMaps.
+         * The stage of the applicationgateway {0} allowing to specify UrlPathMaps.
          */
         interface WithUrlPathMaps {
             /**
              * Specifies urlPathMaps.
-             * @param urlPathMaps URL path map of the application gateway resource
-             * @return the next update stage
              */
             Update withUrlPathMaps(List<ApplicationGatewayUrlPathMap> urlPathMaps);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify WebApplicationFirewallConfiguration.
+         * The stage of the applicationgateway {0} allowing to specify WebApplicationFirewallConfiguration.
          */
         interface WithWebApplicationFirewallConfiguration {
             /**
              * Specifies webApplicationFirewallConfiguration.
-             * @param webApplicationFirewallConfiguration Web application firewall configuration
-             * @return the next update stage
              */
             Update withWebApplicationFirewallConfiguration(ApplicationGatewayWebApplicationFirewallConfiguration webApplicationFirewallConfiguration);
         }
 
         /**
-         * The stage of the applicationgateway update allowing to specify Zones.
+         * The stage of the applicationgateway {0} allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting where the resource needs to come from
-             * @return the next update stage
              */
             Update withZones(List<String> zones);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/AzureFirewall.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/AzureFirewall.java
index 920ee4d11317..e38ed6e0a79a 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/AzureFirewall.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/AzureFirewall.java
@@ -73,49 +73,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify ApplicationRuleCollections.
+         * The stage of the azurefirewall update allowing to specify ApplicationRuleCollections.
          */
         interface WithApplicationRuleCollections {
             /**
              * Specifies applicationRuleCollections.
-             * @param applicationRuleCollections Collection of application rule collections used by a Azure Firewall
-             * @return the next definition stage
              */
             WithCreate withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify IpConfigurations.
+         * The stage of the azurefirewall update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configuration of the Azure Firewall resource
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify NetworkRuleCollections.
+         * The stage of the azurefirewall update allowing to specify NetworkRuleCollections.
          */
         interface WithNetworkRuleCollections {
             /**
              * Specifies networkRuleCollections.
-             * @param networkRuleCollections Collection of network rule collections used by a Azure Firewall
-             * @return the next definition stage
              */
             WithCreate withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall definition allowing to specify ProvisioningState.
+         * The stage of the azurefirewall update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -139,49 +131,41 @@ interface Update extends Appliable<AzureFirewall>, Resource.UpdateWithTags<Updat
      */
     interface UpdateStages {
         /**
-         * The stage of the azurefirewall update allowing to specify ApplicationRuleCollections.
+         * The stage of the azurefirewall {0} allowing to specify ApplicationRuleCollections.
          */
         interface WithApplicationRuleCollections {
             /**
              * Specifies applicationRuleCollections.
-             * @param applicationRuleCollections Collection of application rule collections used by a Azure Firewall
-             * @return the next update stage
              */
             Update withApplicationRuleCollections(List<AzureFirewallApplicationRuleCollection> applicationRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify IpConfigurations.
+         * The stage of the azurefirewall {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configuration of the Azure Firewall resource
-             * @return the next update stage
              */
             Update withIpConfigurations(List<AzureFirewallIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify NetworkRuleCollections.
+         * The stage of the azurefirewall {0} allowing to specify NetworkRuleCollections.
          */
         interface WithNetworkRuleCollections {
             /**
              * Specifies networkRuleCollections.
-             * @param networkRuleCollections Collection of network rule collections used by a Azure Firewall
-             * @return the next update stage
              */
             Update withNetworkRuleCollections(List<AzureFirewallNetworkRuleCollection> networkRuleCollections);
         }
 
         /**
-         * The stage of the azurefirewall update allowing to specify ProvisioningState.
+         * The stage of the azurefirewall {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionMonitorResult.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionMonitorResult.java
index 38bb35f3bfc4..3087945673e1 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionMonitorResult.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionMonitorResult.java
@@ -111,9 +111,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group containing Network Watcher
-            * @param networkWatcherName The name of the Network Watcher resource
-            * @return the next definition stage
             */
             WithDestination withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -124,8 +121,6 @@ interface WithNetworkWatcher {
         interface WithDestination {
            /**
             * Specifies destination.
-            * @param destination the destination parameter value
-            * @return the next definition stage
             */
             WithSource withDestination(ConnectionMonitorDestination destination);
         }
@@ -136,8 +131,6 @@ interface WithDestination {
         interface WithSource {
            /**
             * Specifies source.
-            * @param source the source parameter value
-            * @return the next definition stage
             */
             WithCreate withSource(ConnectionMonitorSource source);
         }
@@ -148,8 +141,6 @@ interface WithSource {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next definition stage
              */
             WithCreate withAutoStart(Boolean autoStart);
         }
@@ -160,8 +151,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -172,8 +161,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next definition stage
              */
             WithCreate withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -184,8 +171,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -214,8 +199,6 @@ interface UpdateStages {
         interface WithAutoStart {
             /**
              * Specifies autoStart.
-             * @param autoStart Determines if the connection monitor will start automatically once created
-             * @return the next update stage
              */
             Update withAutoStart(Boolean autoStart);
         }
@@ -226,8 +209,6 @@ interface WithAutoStart {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Connection monitor location
-             * @return the next update stage
              */
             Update withLocation(String location);
         }
@@ -238,8 +219,6 @@ interface WithLocation {
         interface WithMonitoringIntervalInSeconds {
             /**
              * Specifies monitoringIntervalInSeconds.
-             * @param monitoringIntervalInSeconds Monitoring interval in seconds
-             * @return the next update stage
              */
             Update withMonitoringIntervalInSeconds(Integer monitoringIntervalInSeconds);
         }
@@ -250,8 +229,6 @@ interface WithMonitoringIntervalInSeconds {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Connection monitor tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionStateSnapshot.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionStateSnapshot.java
index 7048fd55a4b8..b7ac63365a21 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionStateSnapshot.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ConnectionStateSnapshot.java
@@ -42,6 +42,36 @@ public class ConnectionStateSnapshot {
     @JsonProperty(value = "evaluationState")
     private EvaluationState evaluationState;
 
+    /**
+     * Average latency in ms.
+     */
+    @JsonProperty(value = "avgLatencyInMs")
+    private Integer avgLatencyInMs;
+
+    /**
+     * Minimum latency in ms.
+     */
+    @JsonProperty(value = "minLatencyInMs")
+    private Integer minLatencyInMs;
+
+    /**
+     * Maximum latency in ms.
+     */
+    @JsonProperty(value = "maxLatencyInMs")
+    private Integer maxLatencyInMs;
+
+    /**
+     * The number of sent probes.
+     */
+    @JsonProperty(value = "probesSent")
+    private Integer probesSent;
+
+    /**
+     * The number of failed probes.
+     */
+    @JsonProperty(value = "probesFailed")
+    private Integer probesFailed;
+
     /**
      * List of hops between the source and the destination.
      */
@@ -128,6 +158,106 @@ public ConnectionStateSnapshot withEvaluationState(EvaluationState evaluationSta
         return this;
     }
 
+    /**
+     * Get average latency in ms.
+     *
+     * @return the avgLatencyInMs value
+     */
+    public Integer avgLatencyInMs() {
+        return this.avgLatencyInMs;
+    }
+
+    /**
+     * Set average latency in ms.
+     *
+     * @param avgLatencyInMs the avgLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withAvgLatencyInMs(Integer avgLatencyInMs) {
+        this.avgLatencyInMs = avgLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get minimum latency in ms.
+     *
+     * @return the minLatencyInMs value
+     */
+    public Integer minLatencyInMs() {
+        return this.minLatencyInMs;
+    }
+
+    /**
+     * Set minimum latency in ms.
+     *
+     * @param minLatencyInMs the minLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withMinLatencyInMs(Integer minLatencyInMs) {
+        this.minLatencyInMs = minLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get maximum latency in ms.
+     *
+     * @return the maxLatencyInMs value
+     */
+    public Integer maxLatencyInMs() {
+        return this.maxLatencyInMs;
+    }
+
+    /**
+     * Set maximum latency in ms.
+     *
+     * @param maxLatencyInMs the maxLatencyInMs value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withMaxLatencyInMs(Integer maxLatencyInMs) {
+        this.maxLatencyInMs = maxLatencyInMs;
+        return this;
+    }
+
+    /**
+     * Get the number of sent probes.
+     *
+     * @return the probesSent value
+     */
+    public Integer probesSent() {
+        return this.probesSent;
+    }
+
+    /**
+     * Set the number of sent probes.
+     *
+     * @param probesSent the probesSent value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withProbesSent(Integer probesSent) {
+        this.probesSent = probesSent;
+        return this;
+    }
+
+    /**
+     * Get the number of failed probes.
+     *
+     * @return the probesFailed value
+     */
+    public Integer probesFailed() {
+        return this.probesFailed;
+    }
+
+    /**
+     * Set the number of failed probes.
+     *
+     * @param probesFailed the probesFailed value to set
+     * @return the ConnectionStateSnapshot object itself.
+     */
+    public ConnectionStateSnapshot withProbesFailed(Integer probesFailed) {
+        this.probesFailed = probesFailed;
+        return this;
+    }
+
     /**
      * Get list of hops between the source and the destination.
      *
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponse.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponse.java
new file mode 100644
index 000000000000..ebc7b2804da1
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponse.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The error object.
+ */
+public class ErrorResponse {
+    /**
+     * Error.
+     */
+    @JsonProperty(value = "error")
+    private ErrorDetails error;
+
+    /**
+     * Get the error value.
+     *
+     * @return the error value
+     */
+    public ErrorDetails error() {
+        return this.error;
+    }
+
+    /**
+     * Set the error value.
+     *
+     * @param error the error value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withError(ErrorDetails error) {
+        this.error = error;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponseException.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponseException.java
new file mode 100644
index 000000000000..01fd627d673e
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ErrorResponseException.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with ErrorResponse information.
+ */
+public class ErrorResponseException extends RestException {
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     * @param body the deserialized response body
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response, final ErrorResponse body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public ErrorResponse body() {
+        return (ErrorResponse) super.body();
+    }
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EvaluatedNetworkSecurityGroup.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EvaluatedNetworkSecurityGroup.java
new file mode 100644
index 000000000000..ff9dc1fc588e
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/EvaluatedNetworkSecurityGroup.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Results of network security group evaluation.
+ */
+public class EvaluatedNetworkSecurityGroup {
+    /**
+     * Network security group ID.
+     */
+    @JsonProperty(value = "networkSecurityGroupId")
+    private String networkSecurityGroupId;
+
+    /**
+     * The matchedRule property.
+     */
+    @JsonProperty(value = "matchedRule")
+    private MatchedRule matchedRule;
+
+    /**
+     * List of network security rules evaluation results.
+     */
+    @JsonProperty(value = "rulesEvaluationResult", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkSecurityRulesEvaluationResult> rulesEvaluationResult;
+
+    /**
+     * Get network security group ID.
+     *
+     * @return the networkSecurityGroupId value
+     */
+    public String networkSecurityGroupId() {
+        return this.networkSecurityGroupId;
+    }
+
+    /**
+     * Set network security group ID.
+     *
+     * @param networkSecurityGroupId the networkSecurityGroupId value to set
+     * @return the EvaluatedNetworkSecurityGroup object itself.
+     */
+    public EvaluatedNetworkSecurityGroup withNetworkSecurityGroupId(String networkSecurityGroupId) {
+        this.networkSecurityGroupId = networkSecurityGroupId;
+        return this;
+    }
+
+    /**
+     * Get the matchedRule value.
+     *
+     * @return the matchedRule value
+     */
+    public MatchedRule matchedRule() {
+        return this.matchedRule;
+    }
+
+    /**
+     * Set the matchedRule value.
+     *
+     * @param matchedRule the matchedRule value to set
+     * @return the EvaluatedNetworkSecurityGroup object itself.
+     */
+    public EvaluatedNetworkSecurityGroup withMatchedRule(MatchedRule matchedRule) {
+        this.matchedRule = matchedRule;
+        return this;
+    }
+
+    /**
+     * Get list of network security rules evaluation results.
+     *
+     * @return the rulesEvaluationResult value
+     */
+    public List<NetworkSecurityRulesEvaluationResult> rulesEvaluationResult() {
+        return this.rulesEvaluationResult;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuit.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuit.java
index 01644aac4387..562c380bf1c5 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuit.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuit.java
@@ -110,133 +110,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next definition stage
              */
             WithCreate withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Authorizations.
+         * The stage of the expressroutecircuit update allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next definition stage
              */
             WithCreate withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next definition stage
              */
             WithCreate withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Peerings.
+         * The stage of the expressroutecircuit update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next definition stage
              */
             WithCreate withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next definition stage
              */
             WithCreate withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit definition allowing to specify Sku.
+         * The stage of the expressroutecircuit update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next definition stage
              */
             WithCreate withSku(ExpressRouteCircuitSku sku);
         }
@@ -260,133 +238,111 @@ interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the expressroutecircuit update allowing to specify AllowClassicOperations.
+         * The stage of the expressroutecircuit {0} allowing to specify AllowClassicOperations.
          */
         interface WithAllowClassicOperations {
             /**
              * Specifies allowClassicOperations.
-             * @param allowClassicOperations Allow classic operations
-             * @return the next update stage
              */
             Update withAllowClassicOperations(Boolean allowClassicOperations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Authorizations.
+         * The stage of the expressroutecircuit {0} allowing to specify Authorizations.
          */
         interface WithAuthorizations {
             /**
              * Specifies authorizations.
-             * @param authorizations The list of authorizations
-             * @return the next update stage
              */
             Update withAuthorizations(List<ExpressRouteCircuitAuthorizationInner> authorizations);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify CircuitProvisioningState.
          */
         interface WithCircuitProvisioningState {
             /**
              * Specifies circuitProvisioningState.
-             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
-             * @return the next update stage
              */
             Update withCircuitProvisioningState(String circuitProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify GatewayManagerEtag.
+         * The stage of the expressroutecircuit {0} allowing to specify GatewayManagerEtag.
          */
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Peerings.
+         * The stage of the expressroutecircuit {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceKey.
          */
         interface WithServiceKey {
             /**
              * Specifies serviceKey.
-             * @param serviceKey The ServiceKey
-             * @return the next update stage
              */
             Update withServiceKey(String serviceKey);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes The ServiceProviderNotes
-             * @return the next update stage
              */
             Update withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProperties.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProperties.
          */
         interface WithServiceProviderProperties {
             /**
              * Specifies serviceProviderProperties.
-             * @param serviceProviderProperties The ServiceProviderProperties
-             * @return the next update stage
              */
             Update withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecircuit {0} allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next update stage
              */
             Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
 
         /**
-         * The stage of the expressroutecircuit update allowing to specify Sku.
+         * The stage of the expressroutecircuit {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The SKU
-             * @return the next update stage
              */
             Update withSku(ExpressRouteCircuitSku sku);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitAuthorization.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitAuthorization.java
index 718e8f96890a..be663eeb4584 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitAuthorization.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitAuthorization.java
@@ -74,9 +74,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -87,8 +84,6 @@ interface WithExpressRouteCircuit {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
@@ -99,8 +94,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next definition stage
              */
             WithCreate withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -111,8 +104,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -123,8 +114,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -135,8 +124,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -165,8 +152,6 @@ interface UpdateStages {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
@@ -177,8 +162,6 @@ interface WithAuthorizationKey {
         interface WithAuthorizationUseStatus {
             /**
              * Specifies authorizationUseStatus.
-             * @param authorizationUseStatus AuthorizationUseStatus. Possible values are: 'Available' and 'InUse'. Possible values include: 'Available', 'InUse'
-             * @return the next update stage
              */
             Update withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
         }
@@ -189,8 +172,6 @@ interface WithAuthorizationUseStatus {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -201,8 +182,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -213,8 +192,6 @@ interface WithName {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitConnection.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitConnection.java
index d864e783f5e8..ca788fa5bc86 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitConnection.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitConnection.java
@@ -90,10 +90,6 @@ interface Blank extends WithPeering {
         interface WithPeering {
            /**
             * Specifies resourceGroupName, circuitName, peeringName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @param peeringName The name of the peering
-            * @return the next definition stage
             */
             WithCreate withExistingPeering(String resourceGroupName, String circuitName, String peeringName);
         }
@@ -104,8 +100,6 @@ interface WithPeering {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -116,8 +110,6 @@ interface WithAddressPrefix {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
@@ -128,8 +120,6 @@ interface WithAuthorizationKey {
         interface WithExpressRouteCircuitPeering {
             /**
              * Specifies expressRouteCircuitPeering.
-             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
-             * @return the next definition stage
              */
             WithCreate withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
         }
@@ -140,8 +130,6 @@ interface WithExpressRouteCircuitPeering {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -152,8 +140,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -164,8 +150,6 @@ interface WithName {
         interface WithPeerExpressRouteCircuitPeering {
             /**
              * Specifies peerExpressRouteCircuitPeering.
-             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
-             * @return the next definition stage
              */
             WithCreate withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
         }
@@ -194,8 +178,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix /29 IP address space to carve out Customer addresses for tunnels
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -206,8 +188,6 @@ interface WithAddressPrefix {
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorization key
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
@@ -218,8 +198,6 @@ interface WithAuthorizationKey {
         interface WithExpressRouteCircuitPeering {
             /**
              * Specifies expressRouteCircuitPeering.
-             * @param expressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the circuit initiating connection
-             * @return the next update stage
              */
             Update withExpressRouteCircuitPeering(SubResource expressRouteCircuitPeering);
         }
@@ -230,8 +208,6 @@ interface WithExpressRouteCircuitPeering {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -242,8 +218,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -254,8 +228,6 @@ interface WithName {
         interface WithPeerExpressRouteCircuitPeering {
             /**
              * Specifies peerExpressRouteCircuitPeering.
-             * @param peerExpressRouteCircuitPeering Reference to Express Route Circuit Private Peering Resource of the peered circuit
-             * @return the next update stage
              */
             Update withPeerExpressRouteCircuitPeering(SubResource peerExpressRouteCircuitPeering);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeering.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeering.java
index 5733396a69d4..1e405df9d44f 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeering.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCircuitPeering.java
@@ -153,9 +153,6 @@ interface Blank extends WithExpressRouteCircuit {
         interface WithExpressRouteCircuit {
            /**
             * Specifies resourceGroupName, circuitName.
-            * @param resourceGroupName The name of the resource group
-            * @param circuitName The name of the express route circuit
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
@@ -166,8 +163,6 @@ interface WithExpressRouteCircuit {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next definition stage
              */
             WithCreate withAzureASN(Integer azureASN);
         }
@@ -178,8 +173,6 @@ interface WithAzureASN {
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
-             * @return the next definition stage
              */
             WithCreate withConnections(List<ExpressRouteCircuitConnectionInner> connections);
         }
@@ -190,8 +183,6 @@ interface WithConnections {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -202,8 +193,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -214,8 +203,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next definition stage
              */
             WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -226,8 +213,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next definition stage
              */
             WithCreate withLastModifiedBy(String lastModifiedBy);
         }
@@ -238,8 +223,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next definition stage
              */
             WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -250,8 +233,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -262,8 +243,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next definition stage
              */
             WithCreate withPeerASN(Long peerASN);
         }
@@ -274,8 +253,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next definition stage
              */
             WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -286,8 +263,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next definition stage
              */
             WithCreate withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -298,8 +273,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next definition stage
              */
             WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -310,8 +283,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -322,8 +293,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next definition stage
              */
             WithCreate withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -334,8 +303,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next definition stage
              */
             WithCreate withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -346,8 +313,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next definition stage
              */
             WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -358,8 +323,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -370,8 +333,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next definition stage
              */
             WithCreate withState(ExpressRoutePeeringState state);
         }
@@ -382,8 +343,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next definition stage
              */
             WithCreate withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -394,8 +353,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next definition stage
              */
             WithCreate withVlanId(Integer vlanId);
         }
@@ -424,8 +381,6 @@ interface UpdateStages {
         interface WithAzureASN {
             /**
              * Specifies azureASN.
-             * @param azureASN The Azure ASN
-             * @return the next update stage
              */
             Update withAzureASN(Integer azureASN);
         }
@@ -436,8 +391,6 @@ interface WithAzureASN {
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections The list of circuit connections associated with Azure Private Peering for this circuit
-             * @return the next update stage
              */
             Update withConnections(List<ExpressRouteCircuitConnectionInner> connections);
         }
@@ -448,8 +401,6 @@ interface WithConnections {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -460,8 +411,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -472,8 +421,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next update stage
              */
             Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -484,8 +431,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next update stage
              */
             Update withLastModifiedBy(String lastModifiedBy);
         }
@@ -496,8 +441,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next update stage
              */
             Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -508,8 +451,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -520,8 +461,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next update stage
              */
             Update withPeerASN(Long peerASN);
         }
@@ -532,8 +471,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next update stage
              */
             Update withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -544,8 +481,6 @@ interface WithPeeringType {
         interface WithPrimaryAzurePort {
             /**
              * Specifies primaryAzurePort.
-             * @param primaryAzurePort The primary port
-             * @return the next update stage
              */
             Update withPrimaryAzurePort(String primaryAzurePort);
         }
@@ -556,8 +491,6 @@ interface WithPrimaryAzurePort {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next update stage
              */
             Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -568,8 +501,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -580,8 +511,6 @@ interface WithProvisioningState {
         interface WithRouteFilter {
             /**
              * Specifies routeFilter.
-             * @param routeFilter The reference of the RouteFilter resource
-             * @return the next update stage
              */
             Update withRouteFilter(RouteFilterInner routeFilter);
         }
@@ -592,8 +521,6 @@ interface WithRouteFilter {
         interface WithSecondaryAzurePort {
             /**
              * Specifies secondaryAzurePort.
-             * @param secondaryAzurePort The secondary port
-             * @return the next update stage
              */
             Update withSecondaryAzurePort(String secondaryAzurePort);
         }
@@ -604,8 +531,6 @@ interface WithSecondaryAzurePort {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next update stage
              */
             Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -616,8 +541,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -628,8 +551,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next update stage
              */
             Update withState(ExpressRoutePeeringState state);
         }
@@ -640,8 +561,6 @@ interface WithState {
         interface WithStats {
             /**
              * Specifies stats.
-             * @param stats Gets peering stats
-             * @return the next update stage
              */
             Update withStats(ExpressRouteCircuitStatsInner stats);
         }
@@ -652,8 +571,6 @@ interface WithStats {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next update stage
              */
             Update withVlanId(Integer vlanId);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnection.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnection.java
index eacde5a0ffe7..edfe7db7a6ef 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnection.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnection.java
@@ -104,73 +104,61 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify BandwidthInMbps.
+         * The stage of the expressroutecrossconnection update allowing to specify BandwidthInMbps.
          */
         interface WithBandwidthInMbps {
             /**
              * Specifies bandwidthInMbps.
-             * @param bandwidthInMbps The circuit bandwidth In Mbps
-             * @return the next definition stage
              */
             WithCreate withBandwidthInMbps(Integer bandwidthInMbps);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ExpressRouteCircuit.
+         * The stage of the expressroutecrossconnection update allowing to specify ExpressRouteCircuit.
          */
         interface WithExpressRouteCircuit {
             /**
              * Specifies expressRouteCircuit.
-             * @param expressRouteCircuit The ExpressRouteCircuit
-             * @return the next definition stage
              */
             WithCreate withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify PeeringLocation.
+         * The stage of the expressroutecrossconnection update allowing to specify PeeringLocation.
          */
         interface WithPeeringLocation {
             /**
              * Specifies peeringLocation.
-             * @param peeringLocation The peering location of the ExpressRoute circuit
-             * @return the next definition stage
              */
             WithCreate withPeeringLocation(String peeringLocation);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify Peerings.
+         * The stage of the expressroutecrossconnection update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
-             * @return the next definition stage
              */
             WithCreate withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecrossconnection definition allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next definition stage
              */
             WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
@@ -194,73 +182,61 @@ interface Update extends Appliable<ExpressRouteCrossConnection>, Resource.Update
      */
     interface UpdateStages {
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify BandwidthInMbps.
+         * The stage of the expressroutecrossconnection {0} allowing to specify BandwidthInMbps.
          */
         interface WithBandwidthInMbps {
             /**
              * Specifies bandwidthInMbps.
-             * @param bandwidthInMbps The circuit bandwidth In Mbps
-             * @return the next update stage
              */
             Update withBandwidthInMbps(Integer bandwidthInMbps);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ExpressRouteCircuit.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ExpressRouteCircuit.
          */
         interface WithExpressRouteCircuit {
             /**
              * Specifies expressRouteCircuit.
-             * @param expressRouteCircuit The ExpressRouteCircuit
-             * @return the next update stage
              */
             Update withExpressRouteCircuit(ExpressRouteCircuitReference expressRouteCircuit);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify PeeringLocation.
+         * The stage of the expressroutecrossconnection {0} allowing to specify PeeringLocation.
          */
         interface WithPeeringLocation {
             /**
              * Specifies peeringLocation.
-             * @param peeringLocation The peering location of the ExpressRoute circuit
-             * @return the next update stage
              */
             Update withPeeringLocation(String peeringLocation);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify Peerings.
+         * The stage of the expressroutecrossconnection {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings The list of peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCrossConnectionPeeringInner> peerings);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderNotes.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ServiceProviderNotes.
          */
         interface WithServiceProviderNotes {
             /**
              * Specifies serviceProviderNotes.
-             * @param serviceProviderNotes Additional read only notes set by the connectivity provider
-             * @return the next update stage
              */
             Update withServiceProviderNotes(String serviceProviderNotes);
         }
 
         /**
-         * The stage of the expressroutecrossconnection update allowing to specify ServiceProviderProvisioningState.
+         * The stage of the expressroutecrossconnection {0} allowing to specify ServiceProviderProvisioningState.
          */
         interface WithServiceProviderProvisioningState {
             /**
              * Specifies serviceProviderProvisioningState.
-             * @param serviceProviderProvisioningState The provisioning state of the circuit in the connectivity provider system. Possible values are 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
-             * @return the next update stage
              */
             Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnectionPeering.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnectionPeering.java
index 4293752784f1..47cb0d2f6166 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnectionPeering.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/ExpressRouteCrossConnectionPeering.java
@@ -134,9 +134,6 @@ interface Blank extends WithExpressRouteCrossConnection {
         interface WithExpressRouteCrossConnection {
            /**
             * Specifies resourceGroupName, crossConnectionName.
-            * @param resourceGroupName The name of the resource group
-            * @param crossConnectionName The name of the ExpressRouteCrossConnection
-            * @return the next definition stage
             */
             WithCreate withExistingExpressRouteCrossConnection(String resourceGroupName, String crossConnectionName);
         }
@@ -147,8 +144,6 @@ interface WithExpressRouteCrossConnection {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next definition stage
              */
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -159,8 +154,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -171,8 +164,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next definition stage
              */
             WithCreate withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -183,8 +174,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next definition stage
              */
             WithCreate withLastModifiedBy(String lastModifiedBy);
         }
@@ -195,8 +184,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next definition stage
              */
             WithCreate withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -207,8 +194,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -219,8 +204,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next definition stage
              */
             WithCreate withPeerASN(Long peerASN);
         }
@@ -231,8 +214,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next definition stage
              */
             WithCreate withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -243,8 +224,6 @@ interface WithPeeringType {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next definition stage
              */
             WithCreate withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -255,8 +234,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next definition stage
              */
             WithCreate withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -267,8 +244,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -279,8 +254,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next definition stage
              */
             WithCreate withState(ExpressRoutePeeringState state);
         }
@@ -291,8 +264,6 @@ interface WithState {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next definition stage
              */
             WithCreate withVlanId(Integer vlanId);
         }
@@ -321,8 +292,6 @@ interface UpdateStages {
         interface WithGatewayManagerEtag {
             /**
              * Specifies gatewayManagerEtag.
-             * @param gatewayManagerEtag The GatewayManager Etag
-             * @return the next update stage
              */
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
@@ -333,8 +302,6 @@ interface WithGatewayManagerEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -345,8 +312,6 @@ interface WithId {
         interface WithIpv6PeeringConfig {
             /**
              * Specifies ipv6PeeringConfig.
-             * @param ipv6PeeringConfig The IPv6 peering configuration
-             * @return the next update stage
              */
             Update withIpv6PeeringConfig(Ipv6ExpressRouteCircuitPeeringConfig ipv6PeeringConfig);
         }
@@ -357,8 +322,6 @@ interface WithIpv6PeeringConfig {
         interface WithLastModifiedBy {
             /**
              * Specifies lastModifiedBy.
-             * @param lastModifiedBy Gets whether the provider or the customer last modified the peering
-             * @return the next update stage
              */
             Update withLastModifiedBy(String lastModifiedBy);
         }
@@ -369,8 +332,6 @@ interface WithLastModifiedBy {
         interface WithMicrosoftPeeringConfig {
             /**
              * Specifies microsoftPeeringConfig.
-             * @param microsoftPeeringConfig The Microsoft peering configuration
-             * @return the next update stage
              */
             Update withMicrosoftPeeringConfig(ExpressRouteCircuitPeeringConfig microsoftPeeringConfig);
         }
@@ -381,8 +342,6 @@ interface WithMicrosoftPeeringConfig {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -393,8 +352,6 @@ interface WithName {
         interface WithPeerASN {
             /**
              * Specifies peerASN.
-             * @param peerASN The peer ASN
-             * @return the next update stage
              */
             Update withPeerASN(Long peerASN);
         }
@@ -405,8 +362,6 @@ interface WithPeerASN {
         interface WithPeeringType {
             /**
              * Specifies peeringType.
-             * @param peeringType The peering type. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'
-             * @return the next update stage
              */
             Update withPeeringType(ExpressRoutePeeringType peeringType);
         }
@@ -417,8 +372,6 @@ interface WithPeeringType {
         interface WithPrimaryPeerAddressPrefix {
             /**
              * Specifies primaryPeerAddressPrefix.
-             * @param primaryPeerAddressPrefix The primary address prefix
-             * @return the next update stage
              */
             Update withPrimaryPeerAddressPrefix(String primaryPeerAddressPrefix);
         }
@@ -429,8 +382,6 @@ interface WithPrimaryPeerAddressPrefix {
         interface WithSecondaryPeerAddressPrefix {
             /**
              * Specifies secondaryPeerAddressPrefix.
-             * @param secondaryPeerAddressPrefix The secondary address prefix
-             * @return the next update stage
              */
             Update withSecondaryPeerAddressPrefix(String secondaryPeerAddressPrefix);
         }
@@ -441,8 +392,6 @@ interface WithSecondaryPeerAddressPrefix {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -453,8 +402,6 @@ interface WithSharedKey {
         interface WithState {
             /**
              * Specifies state.
-             * @param state The peering state. Possible values include: 'Disabled', 'Enabled'
-             * @return the next update stage
              */
             Update withState(ExpressRoutePeeringState state);
         }
@@ -465,8 +412,6 @@ interface WithState {
         interface WithVlanId {
             /**
              * Specifies vlanId.
-             * @param vlanId The VLAN ID
-             * @return the next update stage
              */
             Update withVlanId(Integer vlanId);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/InboundNatRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/InboundNatRule.java
index 3e3c42c37257..95295748a1b0 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/InboundNatRule.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/InboundNatRule.java
@@ -100,9 +100,6 @@ interface Blank extends WithLoadBalancer {
         interface WithLoadBalancer {
            /**
             * Specifies resourceGroupName, loadBalancerName.
-            * @param resourceGroupName The name of the resource group
-            * @param loadBalancerName The name of the load balancer
-            * @return the next definition stage
             */
             WithCreate withExistingLoadBalancer(String resourceGroupName, String loadBalancerName);
         }
@@ -113,8 +110,6 @@ interface WithLoadBalancer {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next definition stage
              */
             WithCreate withBackendPort(Integer backendPort);
         }
@@ -125,8 +120,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next definition stage
              */
             WithCreate withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -137,8 +130,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -149,8 +140,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -161,8 +150,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next definition stage
              */
             WithCreate withFrontendPort(Integer frontendPort);
         }
@@ -173,8 +160,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -185,8 +170,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -197,8 +180,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -209,8 +190,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next definition stage
              */
             WithCreate withProtocol(TransportProtocol protocol);
         }
@@ -221,8 +200,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -251,8 +228,6 @@ interface UpdateStages {
         interface WithBackendPort {
             /**
              * Specifies backendPort.
-             * @param backendPort The port used for the internal endpoint. Acceptable values range from 1 to 65535
-             * @return the next update stage
              */
             Update withBackendPort(Integer backendPort);
         }
@@ -263,8 +238,6 @@ interface WithBackendPort {
         interface WithEnableFloatingIP {
             /**
              * Specifies enableFloatingIP.
-             * @param enableFloatingIP Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint
-             * @return the next update stage
              */
             Update withEnableFloatingIP(Boolean enableFloatingIP);
         }
@@ -275,8 +248,6 @@ interface WithEnableFloatingIP {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -287,8 +258,6 @@ interface WithEtag {
         interface WithFrontendIPConfiguration {
             /**
              * Specifies frontendIPConfiguration.
-             * @param frontendIPConfiguration A reference to frontend IP addresses
-             * @return the next update stage
              */
             Update withFrontendIPConfiguration(SubResource frontendIPConfiguration);
         }
@@ -299,8 +268,6 @@ interface WithFrontendIPConfiguration {
         interface WithFrontendPort {
             /**
              * Specifies frontendPort.
-             * @param frontendPort The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. Acceptable values range from 1 to 65534
-             * @return the next update stage
              */
             Update withFrontendPort(Integer frontendPort);
         }
@@ -311,8 +278,6 @@ interface WithFrontendPort {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The timeout for the TCP idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to TCP
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
@@ -335,8 +298,6 @@ interface WithIdleTimeoutInMinutes {
         interface WithName {
             /**
              * Specifies name.
-             * @param name Gets name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -347,8 +308,6 @@ interface WithName {
         interface WithProtocol {
             /**
              * Specifies protocol.
-             * @param protocol Possible values include: 'Udp', 'Tcp', 'All'
-             * @return the next update stage
              */
             Update withProtocol(TransportProtocol protocol);
         }
@@ -359,8 +318,6 @@ interface WithProtocol {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LoadBalancer.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LoadBalancer.java
index a03e5c7e3efa..7047c12b9d2d 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LoadBalancer.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LoadBalancer.java
@@ -108,133 +108,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next definition stage
              */
             WithCreate withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Etag.
+         * The stage of the loadbalancer update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next definition stage
              */
             WithCreate withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatPools.
+         * The stage of the loadbalancer update allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify InboundNatRules.
+         * The stage of the loadbalancer update allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next definition stage
              */
             WithCreate withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next definition stage
              */
             WithCreate withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Probes.
+         * The stage of the loadbalancer update allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next definition stage
              */
             WithCreate withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ProvisioningState.
+         * The stage of the loadbalancer update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify ResourceGuid.
+         * The stage of the loadbalancer update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer definition allowing to specify Sku.
+         * The stage of the loadbalancer update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next definition stage
              */
             WithCreate withSku(LoadBalancerSku sku);
         }
@@ -258,133 +236,111 @@ interface Update extends Appliable<LoadBalancer>, Resource.UpdateWithTags<Update
      */
     interface UpdateStages {
         /**
-         * The stage of the loadbalancer update allowing to specify BackendAddressPools.
+         * The stage of the loadbalancer {0} allowing to specify BackendAddressPools.
          */
         interface WithBackendAddressPools {
             /**
              * Specifies backendAddressPools.
-             * @param backendAddressPools Collection of backend address pools used by a load balancer
-             * @return the next update stage
              */
             Update withBackendAddressPools(List<BackendAddressPoolInner> backendAddressPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Etag.
+         * The stage of the loadbalancer {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify FrontendIPConfigurations.
+         * The stage of the loadbalancer {0} allowing to specify FrontendIPConfigurations.
          */
         interface WithFrontendIPConfigurations {
             /**
              * Specifies frontendIPConfigurations.
-             * @param frontendIPConfigurations Object representing the frontend IPs to be used for the load balancer
-             * @return the next update stage
              */
             Update withFrontendIPConfigurations(List<FrontendIPConfigurationInner> frontendIPConfigurations);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatPools.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatPools.
          */
         interface WithInboundNatPools {
             /**
              * Specifies inboundNatPools.
-             * @param inboundNatPools Defines an external port range for inbound NAT to a single backend port on NICs associated with a load balancer. Inbound NAT rules are created automatically for each NIC associated with the Load Balancer using an external port from this range. Defining an Inbound NAT pool on your Load Balancer is mutually exclusive with defining inbound Nat rules. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatPools(List<InboundNatPool> inboundNatPools);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify InboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify InboundNatRules.
          */
         interface WithInboundNatRules {
             /**
              * Specifies inboundNatRules.
-             * @param inboundNatRules Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules
-             * @return the next update stage
              */
             Update withInboundNatRules(List<InboundNatRuleInner> inboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify LoadBalancingRules.
+         * The stage of the loadbalancer {0} allowing to specify LoadBalancingRules.
          */
         interface WithLoadBalancingRules {
             /**
              * Specifies loadBalancingRules.
-             * @param loadBalancingRules Object collection representing the load balancing rules Gets the provisioning
-             * @return the next update stage
              */
             Update withLoadBalancingRules(List<LoadBalancingRuleInner> loadBalancingRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify OutboundNatRules.
+         * The stage of the loadbalancer {0} allowing to specify OutboundNatRules.
          */
         interface WithOutboundNatRules {
             /**
              * Specifies outboundNatRules.
-             * @param outboundNatRules The outbound NAT rules
-             * @return the next update stage
              */
             Update withOutboundNatRules(List<OutboundNatRule> outboundNatRules);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Probes.
+         * The stage of the loadbalancer {0} allowing to specify Probes.
          */
         interface WithProbes {
             /**
              * Specifies probes.
-             * @param probes Collection of probe objects used in the load balancer
-             * @return the next update stage
              */
             Update withProbes(List<ProbeInner> probes);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ProvisioningState.
+         * The stage of the loadbalancer {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify ResourceGuid.
+         * The stage of the loadbalancer {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the load balancer resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the loadbalancer update allowing to specify Sku.
+         * The stage of the loadbalancer {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The load balancer SKU
-             * @return the next update stage
              */
             Update withSku(LoadBalancerSku sku);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LocalNetworkGateway.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LocalNetworkGateway.java
index 5ea1acfe36b9..69df51b86f82 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LocalNetworkGateway.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/LocalNetworkGateway.java
@@ -77,61 +77,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify Etag.
+         * The stage of the localnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next definition stage
              */
             WithCreate withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
@@ -155,61 +145,51 @@ interface Update extends Appliable<LocalNetworkGateway>, Resource.UpdateWithTags
      */
     interface UpdateStages {
         /**
-         * The stage of the localnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the localnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify Etag.
+         * The stage of the localnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify GatewayIpAddress.
+         * The stage of the localnetworkgateway {0} allowing to specify GatewayIpAddress.
          */
         interface WithGatewayIpAddress {
             /**
              * Specifies gatewayIpAddress.
-             * @param gatewayIpAddress IP address of local network gateway
-             * @return the next update stage
              */
             Update withGatewayIpAddress(String gatewayIpAddress);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify LocalNetworkAddressSpace.
+         * The stage of the localnetworkgateway {0} allowing to specify LocalNetworkAddressSpace.
          */
         interface WithLocalNetworkAddressSpace {
             /**
              * Specifies localNetworkAddressSpace.
-             * @param localNetworkAddressSpace Local network site address space
-             * @return the next update stage
              */
             Update withLocalNetworkAddressSpace(AddressSpace localNetworkAddressSpace);
         }
 
         /**
-         * The stage of the localnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the localnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the LocalNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/MatchedRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/MatchedRule.java
new file mode 100644
index 000000000000..c29c5b5cb061
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/MatchedRule.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Matched rule.
+ */
+public class MatchedRule {
+    /**
+     * Name of the matched network security rule.
+     */
+    @JsonProperty(value = "ruleName")
+    private String ruleName;
+
+    /**
+     * The network traffic is allowed or denied. Possible values are 'Allow'
+     * and 'Deny'.
+     */
+    @JsonProperty(value = "action")
+    private String action;
+
+    /**
+     * Get name of the matched network security rule.
+     *
+     * @return the ruleName value
+     */
+    public String ruleName() {
+        return this.ruleName;
+    }
+
+    /**
+     * Set name of the matched network security rule.
+     *
+     * @param ruleName the ruleName value to set
+     * @return the MatchedRule object itself.
+     */
+    public MatchedRule withRuleName(String ruleName) {
+        this.ruleName = ruleName;
+        return this;
+    }
+
+    /**
+     * Get the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'.
+     *
+     * @return the action value
+     */
+    public String action() {
+        return this.action;
+    }
+
+    /**
+     * Set the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'.
+     *
+     * @param action the action value to set
+     * @return the MatchedRule object itself.
+     */
+    public MatchedRule withAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticParameters.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticParameters.java
new file mode 100644
index 000000000000..224226c2db34
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticParameters.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters to get network configuration diagnostic.
+ */
+public class NetworkConfigurationDiagnosticParameters {
+    /**
+     * The ID of the target resource to perform network configuration
+     * diagnostic. Valid options are VM, NetworkInterface,
+     * VMSS/NetworkInterface and Application Gateway.
+     */
+    @JsonProperty(value = "targetResourceId", required = true)
+    private String targetResourceId;
+
+    /**
+     * List of traffic queries.
+     */
+    @JsonProperty(value = "queries", required = true)
+    private List<TrafficQuery> queries;
+
+    /**
+     * Get the ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway.
+     *
+     * @return the targetResourceId value
+     */
+    public String targetResourceId() {
+        return this.targetResourceId;
+    }
+
+    /**
+     * Set the ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway.
+     *
+     * @param targetResourceId the targetResourceId value to set
+     * @return the NetworkConfigurationDiagnosticParameters object itself.
+     */
+    public NetworkConfigurationDiagnosticParameters withTargetResourceId(String targetResourceId) {
+        this.targetResourceId = targetResourceId;
+        return this;
+    }
+
+    /**
+     * Get list of traffic queries.
+     *
+     * @return the queries value
+     */
+    public List<TrafficQuery> queries() {
+        return this.queries;
+    }
+
+    /**
+     * Set list of traffic queries.
+     *
+     * @param queries the queries value to set
+     * @return the NetworkConfigurationDiagnosticParameters object itself.
+     */
+    public NetworkConfigurationDiagnosticParameters withQueries(List<TrafficQuery> queries) {
+        this.queries = queries;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResponse.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResponse.java
new file mode 100644
index 000000000000..e4cc4bfe17bc
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResponse.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2018_06_01.implementation.NetworkManager;
+import com.microsoft.azure.management.network.v2018_06_01.implementation.NetworkConfigurationDiagnosticResponseInner;
+import java.util.List;
+
+/**
+ * Type representing NetworkConfigurationDiagnosticResponse.
+ */
+public interface NetworkConfigurationDiagnosticResponse extends HasInner<NetworkConfigurationDiagnosticResponseInner>, HasManager<NetworkManager> {
+    /**
+     * @return the results value.
+     */
+    List<NetworkConfigurationDiagnosticResult> results();
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResult.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResult.java
new file mode 100644
index 000000000000..eab7413d051b
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkConfigurationDiagnosticResult.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network configuration diagnostic result corresponded to provided traffic
+ * query.
+ */
+public class NetworkConfigurationDiagnosticResult {
+    /**
+     * The trafficQuery property.
+     */
+    @JsonProperty(value = "trafficQuery")
+    private TrafficQuery trafficQuery;
+
+    /**
+     * The networkSecurityGroupResult property.
+     */
+    @JsonProperty(value = "networkSecurityGroupResult")
+    private NetworkSecurityGroupResult networkSecurityGroupResult;
+
+    /**
+     * Get the trafficQuery value.
+     *
+     * @return the trafficQuery value
+     */
+    public TrafficQuery trafficQuery() {
+        return this.trafficQuery;
+    }
+
+    /**
+     * Set the trafficQuery value.
+     *
+     * @param trafficQuery the trafficQuery value to set
+     * @return the NetworkConfigurationDiagnosticResult object itself.
+     */
+    public NetworkConfigurationDiagnosticResult withTrafficQuery(TrafficQuery trafficQuery) {
+        this.trafficQuery = trafficQuery;
+        return this;
+    }
+
+    /**
+     * Get the networkSecurityGroupResult value.
+     *
+     * @return the networkSecurityGroupResult value
+     */
+    public NetworkSecurityGroupResult networkSecurityGroupResult() {
+        return this.networkSecurityGroupResult;
+    }
+
+    /**
+     * Set the networkSecurityGroupResult value.
+     *
+     * @param networkSecurityGroupResult the networkSecurityGroupResult value to set
+     * @return the NetworkConfigurationDiagnosticResult object itself.
+     */
+    public NetworkConfigurationDiagnosticResult withNetworkSecurityGroupResult(NetworkSecurityGroupResult networkSecurityGroupResult) {
+        this.networkSecurityGroupResult = networkSecurityGroupResult;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkInterface.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkInterface.java
index 66985047b428..dcc3e8e1ede1 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkInterface.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkInterface.java
@@ -106,133 +106,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify DnsSettings.
+         * The stage of the networkinterface update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next definition stage
              */
             WithCreate withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next definition stage
              */
             WithCreate withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Etag.
+         * The stage of the networkinterface update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify IpConfigurations.
+         * The stage of the networkinterface update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify MacAddress.
+         * The stage of the networkinterface update allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next definition stage
              */
             WithCreate withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify Primary.
+         * The stage of the networkinterface update allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next definition stage
              */
             WithCreate withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ProvisioningState.
+         * The stage of the networkinterface update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify ResourceGuid.
+         * The stage of the networkinterface update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface definition allowing to specify VirtualMachine.
+         * The stage of the networkinterface update allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next definition stage
              */
             WithCreate withVirtualMachine(SubResource virtualMachine);
         }
@@ -256,133 +234,111 @@ interface Update extends Appliable<NetworkInterface>, Resource.UpdateWithTags<Up
      */
     interface UpdateStages {
         /**
-         * The stage of the networkinterface update allowing to specify DnsSettings.
+         * The stage of the networkinterface {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The DNS settings in network interface
-             * @return the next update stage
              */
             Update withDnsSettings(NetworkInterfaceDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableAcceleratedNetworking.
+         * The stage of the networkinterface {0} allowing to specify EnableAcceleratedNetworking.
          */
         interface WithEnableAcceleratedNetworking {
             /**
              * Specifies enableAcceleratedNetworking.
-             * @param enableAcceleratedNetworking If the network interface is accelerated networking enabled
-             * @return the next update stage
              */
             Update withEnableAcceleratedNetworking(Boolean enableAcceleratedNetworking);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify EnableIPForwarding.
+         * The stage of the networkinterface {0} allowing to specify EnableIPForwarding.
          */
         interface WithEnableIPForwarding {
             /**
              * Specifies enableIPForwarding.
-             * @param enableIPForwarding Indicates whether IP forwarding is enabled on this network interface
-             * @return the next update stage
              */
             Update withEnableIPForwarding(Boolean enableIPForwarding);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Etag.
+         * The stage of the networkinterface {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify IpConfigurations.
+         * The stage of the networkinterface {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations A list of IPConfigurations of the network interface
-             * @return the next update stage
              */
             Update withIpConfigurations(List<NetworkInterfaceIPConfigurationInner> ipConfigurations);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify MacAddress.
+         * The stage of the networkinterface {0} allowing to specify MacAddress.
          */
         interface WithMacAddress {
             /**
              * Specifies macAddress.
-             * @param macAddress The MAC address of the network interface
-             * @return the next update stage
              */
             Update withMacAddress(String macAddress);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify NetworkSecurityGroup.
+         * The stage of the networkinterface {0} allowing to specify NetworkSecurityGroup.
          */
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify Primary.
+         * The stage of the networkinterface {0} allowing to specify Primary.
          */
         interface WithPrimary {
             /**
              * Specifies primary.
-             * @param primary Gets whether this is a primary network interface on a virtual machine
-             * @return the next update stage
              */
             Update withPrimary(Boolean primary);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ProvisioningState.
+         * The stage of the networkinterface {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify ResourceGuid.
+         * The stage of the networkinterface {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network interface resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networkinterface update allowing to specify VirtualMachine.
+         * The stage of the networkinterface {0} allowing to specify VirtualMachine.
          */
         interface WithVirtualMachine {
             /**
              * Specifies virtualMachine.
-             * @param virtualMachine The reference of a virtual machine
-             * @return the next update stage
              */
             Update withVirtualMachine(SubResource virtualMachine);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroup.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroup.java
index 0c6c81d36cc3..45eacb27d1de 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroup.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroup.java
@@ -84,61 +84,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next definition stage
              */
             WithCreate withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify Etag.
+         * The stage of the networksecuritygroup update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup definition allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next definition stage
              */
             WithCreate withSecurityRules(List<SecurityRuleInner> securityRules);
         }
@@ -162,61 +152,51 @@ interface Update extends Appliable<NetworkSecurityGroup>, Resource.UpdateWithTag
      */
     interface UpdateStages {
         /**
-         * The stage of the networksecuritygroup update allowing to specify DefaultSecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify DefaultSecurityRules.
          */
         interface WithDefaultSecurityRules {
             /**
              * Specifies defaultSecurityRules.
-             * @param defaultSecurityRules The default security rules of network security group
-             * @return the next update stage
              */
             Update withDefaultSecurityRules(List<SecurityRuleInner> defaultSecurityRules);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify Etag.
+         * The stage of the networksecuritygroup {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ProvisioningState.
+         * The stage of the networksecuritygroup {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify ResourceGuid.
+         * The stage of the networksecuritygroup {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the network security group resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the networksecuritygroup update allowing to specify SecurityRules.
+         * The stage of the networksecuritygroup {0} allowing to specify SecurityRules.
          */
         interface WithSecurityRules {
             /**
              * Specifies securityRules.
-             * @param securityRules A collection of security rules of the network security group
-             * @return the next update stage
              */
             Update withSecurityRules(List<SecurityRuleInner> securityRules);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupResult.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupResult.java
new file mode 100644
index 000000000000..fb373a464c1e
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupResult.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network configuration diagnostic result corresponded provided traffic query.
+ */
+public class NetworkSecurityGroupResult {
+    /**
+     * The network traffic is allowed or denied. Possible values are 'Allow'
+     * and 'Deny'. Possible values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "securityRuleAccessResult")
+    private SecurityRuleAccess securityRuleAccessResult;
+
+    /**
+     * List of results network security groups diagnostic.
+     */
+    @JsonProperty(value = "evaluatedNetworkSecurityGroups", access = JsonProperty.Access.WRITE_ONLY)
+    private List<EvaluatedNetworkSecurityGroup> evaluatedNetworkSecurityGroups;
+
+    /**
+     * Get the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the securityRuleAccessResult value
+     */
+    public SecurityRuleAccess securityRuleAccessResult() {
+        return this.securityRuleAccessResult;
+    }
+
+    /**
+     * Set the network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param securityRuleAccessResult the securityRuleAccessResult value to set
+     * @return the NetworkSecurityGroupResult object itself.
+     */
+    public NetworkSecurityGroupResult withSecurityRuleAccessResult(SecurityRuleAccess securityRuleAccessResult) {
+        this.securityRuleAccessResult = securityRuleAccessResult;
+        return this;
+    }
+
+    /**
+     * Get list of results network security groups diagnostic.
+     *
+     * @return the evaluatedNetworkSecurityGroups value
+     */
+    public List<EvaluatedNetworkSecurityGroup> evaluatedNetworkSecurityGroups() {
+        return this.evaluatedNetworkSecurityGroups;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java
index d9a514514959..b0b19ec08b99 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityGroupSecurityRule.java
@@ -141,9 +141,6 @@ interface Blank extends WithNetworkSecurityGroup {
         interface WithNetworkSecurityGroup {
            /**
             * Specifies resourceGroupName, networkSecurityGroupName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkSecurityGroupName The name of the network security group
-            * @return the next definition stage
             */
             WithAccess withExistingNetworkSecurityGroup(String resourceGroupName, String networkSecurityGroupName);
         }
@@ -154,8 +151,6 @@ interface WithNetworkSecurityGroup {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The network traffic is allowed or denied. Possible values are: 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithDirection withAccess(SecurityRuleAccess access);
         }
@@ -166,8 +161,6 @@ interface WithAccess {
         interface WithDirection {
            /**
             * Specifies direction.
-            * @param direction The direction of the rule. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values are: 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound'
-            * @return the next definition stage
             */
             WithProtocol withDirection(SecurityRuleDirection direction);
         }
@@ -178,8 +171,6 @@ interface WithDirection {
         interface WithProtocol {
            /**
             * Specifies protocol.
-            * @param protocol Network protocol this rule applies to. Possible values are 'Tcp', 'Udp', and '*'. Possible values include: 'Tcp', 'Udp', '*'
-            * @return the next definition stage
             */
             WithCreate withProtocol(SecurityRuleProtocol protocol);
         }
@@ -190,8 +181,6 @@ interface WithProtocol {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next definition stage
              */
             WithCreate withDescription(String description);
         }
@@ -202,8 +191,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -214,8 +201,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -226,8 +211,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next definition stage
              */
             WithCreate withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -238,8 +221,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRange(String destinationPortRange);
         }
@@ -250,8 +231,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next definition stage
              */
             WithCreate withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -262,8 +241,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -274,8 +251,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -286,8 +261,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -298,8 +271,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next definition stage
              */
             WithCreate withPriority(Integer priority);
         }
@@ -310,8 +281,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -322,8 +291,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -334,8 +301,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next definition stage
              */
             WithCreate withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -346,8 +311,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next definition stage
              */
             WithCreate withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -358,8 +321,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next definition stage
              */
             WithCreate withSourcePortRange(String sourcePortRange);
         }
@@ -370,8 +331,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next definition stage
              */
             WithCreate withSourcePortRanges(List<String> sourcePortRanges);
         }
@@ -400,8 +359,6 @@ interface UpdateStages {
         interface WithDescription {
             /**
              * Specifies description.
-             * @param description A description for this rule. Restricted to 140 chars
-             * @return the next update stage
              */
             Update withDescription(String description);
         }
@@ -412,8 +369,6 @@ interface WithDescription {
         interface WithDestinationAddressPrefix {
             /**
              * Specifies destinationAddressPrefix.
-             * @param destinationAddressPrefix The destination address prefix. CIDR or destination IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used
-             * @return the next update stage
              */
             Update withDestinationAddressPrefix(String destinationAddressPrefix);
         }
@@ -424,8 +379,6 @@ interface WithDestinationAddressPrefix {
         interface WithDestinationAddressPrefixes {
             /**
              * Specifies destinationAddressPrefixes.
-             * @param destinationAddressPrefixes The destination address prefixes. CIDR or destination IP ranges
-             * @return the next update stage
              */
             Update withDestinationAddressPrefixes(List<String> destinationAddressPrefixes);
         }
@@ -436,8 +389,6 @@ interface WithDestinationAddressPrefixes {
         interface WithDestinationApplicationSecurityGroups {
             /**
              * Specifies destinationApplicationSecurityGroups.
-             * @param destinationApplicationSecurityGroups The application security group specified as destination
-             * @return the next update stage
              */
             Update withDestinationApplicationSecurityGroups(List<ApplicationSecurityGroupInner> destinationApplicationSecurityGroups);
         }
@@ -448,8 +399,6 @@ interface WithDestinationApplicationSecurityGroups {
         interface WithDestinationPortRange {
             /**
              * Specifies destinationPortRange.
-             * @param destinationPortRange The destination port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withDestinationPortRange(String destinationPortRange);
         }
@@ -460,8 +409,6 @@ interface WithDestinationPortRange {
         interface WithDestinationPortRanges {
             /**
              * Specifies destinationPortRanges.
-             * @param destinationPortRanges The destination port ranges
-             * @return the next update stage
              */
             Update withDestinationPortRanges(List<String> destinationPortRanges);
         }
@@ -472,8 +419,6 @@ interface WithDestinationPortRanges {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -484,8 +429,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -496,8 +439,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -508,8 +449,6 @@ interface WithName {
         interface WithPriority {
             /**
              * Specifies priority.
-             * @param priority The priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule
-             * @return the next update stage
              */
             Update withPriority(Integer priority);
         }
@@ -520,8 +459,6 @@ interface WithPriority {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -532,8 +469,6 @@ interface WithProvisioningState {
         interface WithSourceAddressPrefix {
             /**
              * Specifies sourceAddressPrefix.
-             * @param sourceAddressPrefix The CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from
-             * @return the next update stage
              */
             Update withSourceAddressPrefix(String sourceAddressPrefix);
         }
@@ -544,8 +479,6 @@ interface WithSourceAddressPrefix {
         interface WithSourceAddressPrefixes {
             /**
              * Specifies sourceAddressPrefixes.
-             * @param sourceAddressPrefixes The CIDR or source IP ranges
-             * @return the next update stage
              */
             Update withSourceAddressPrefixes(List<String> sourceAddressPrefixes);
         }
@@ -556,8 +489,6 @@ interface WithSourceAddressPrefixes {
         interface WithSourceApplicationSecurityGroups {
             /**
              * Specifies sourceApplicationSecurityGroups.
-             * @param sourceApplicationSecurityGroups The application security group specified as source
-             * @return the next update stage
              */
             Update withSourceApplicationSecurityGroups(List<ApplicationSecurityGroupInner> sourceApplicationSecurityGroups);
         }
@@ -568,8 +499,6 @@ interface WithSourceApplicationSecurityGroups {
         interface WithSourcePortRange {
             /**
              * Specifies sourcePortRange.
-             * @param sourcePortRange The source port or range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports
-             * @return the next update stage
              */
             Update withSourcePortRange(String sourcePortRange);
         }
@@ -580,8 +509,6 @@ interface WithSourcePortRange {
         interface WithSourcePortRanges {
             /**
              * Specifies sourcePortRanges.
-             * @param sourcePortRanges The source port ranges
-             * @return the next update stage
              */
             Update withSourcePortRanges(List<String> sourcePortRanges);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityRulesEvaluationResult.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityRulesEvaluationResult.java
new file mode 100644
index 000000000000..82615fa2c8a5
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkSecurityRulesEvaluationResult.java
@@ -0,0 +1,173 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Network security rules evaluation result.
+ */
+public class NetworkSecurityRulesEvaluationResult {
+    /**
+     * Name of the network security rule.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Value indicating whether protocol is matched.
+     */
+    @JsonProperty(value = "protocolMatched")
+    private Boolean protocolMatched;
+
+    /**
+     * Value indicating whether source is matched.
+     */
+    @JsonProperty(value = "sourceMatched")
+    private Boolean sourceMatched;
+
+    /**
+     * Value indicating whether source port is matched.
+     */
+    @JsonProperty(value = "sourcePortMatched")
+    private Boolean sourcePortMatched;
+
+    /**
+     * Value indicating whether destination is matched.
+     */
+    @JsonProperty(value = "destinationMatched")
+    private Boolean destinationMatched;
+
+    /**
+     * Value indicating whether destination port is matched.
+     */
+    @JsonProperty(value = "destinationPortMatched")
+    private Boolean destinationPortMatched;
+
+    /**
+     * Get name of the network security rule.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set name of the network security rule.
+     *
+     * @param name the name value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether protocol is matched.
+     *
+     * @return the protocolMatched value
+     */
+    public Boolean protocolMatched() {
+        return this.protocolMatched;
+    }
+
+    /**
+     * Set value indicating whether protocol is matched.
+     *
+     * @param protocolMatched the protocolMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withProtocolMatched(Boolean protocolMatched) {
+        this.protocolMatched = protocolMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether source is matched.
+     *
+     * @return the sourceMatched value
+     */
+    public Boolean sourceMatched() {
+        return this.sourceMatched;
+    }
+
+    /**
+     * Set value indicating whether source is matched.
+     *
+     * @param sourceMatched the sourceMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withSourceMatched(Boolean sourceMatched) {
+        this.sourceMatched = sourceMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether source port is matched.
+     *
+     * @return the sourcePortMatched value
+     */
+    public Boolean sourcePortMatched() {
+        return this.sourcePortMatched;
+    }
+
+    /**
+     * Set value indicating whether source port is matched.
+     *
+     * @param sourcePortMatched the sourcePortMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withSourcePortMatched(Boolean sourcePortMatched) {
+        this.sourcePortMatched = sourcePortMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether destination is matched.
+     *
+     * @return the destinationMatched value
+     */
+    public Boolean destinationMatched() {
+        return this.destinationMatched;
+    }
+
+    /**
+     * Set value indicating whether destination is matched.
+     *
+     * @param destinationMatched the destinationMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withDestinationMatched(Boolean destinationMatched) {
+        this.destinationMatched = destinationMatched;
+        return this;
+    }
+
+    /**
+     * Get value indicating whether destination port is matched.
+     *
+     * @return the destinationPortMatched value
+     */
+    public Boolean destinationPortMatched() {
+        return this.destinationPortMatched;
+    }
+
+    /**
+     * Set value indicating whether destination port is matched.
+     *
+     * @param destinationPortMatched the destinationPortMatched value to set
+     * @return the NetworkSecurityRulesEvaluationResult object itself.
+     */
+    public NetworkSecurityRulesEvaluationResult withDestinationPortMatched(Boolean destinationPortMatched) {
+        this.destinationPortMatched = destinationPortMatched;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatcher.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatcher.java
index 3667ba70263d..b82ef4791059 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatcher.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatcher.java
@@ -57,13 +57,11 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the networkwatcher definition allowing to specify Etag.
+         * The stage of the networkwatcher update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -87,13 +85,11 @@ interface Update extends Appliable<NetworkWatcher>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the networkwatcher update allowing to specify Etag.
+         * The stage of the networkwatcher {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatchers.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatchers.java
index a462c56dd7af..f569672a812b 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatchers.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/NetworkWatchers.java
@@ -144,4 +144,15 @@ public interface NetworkWatchers extends SupportsCreating<NetworkWatcher.Definit
      */
     Observable<AvailableProvidersList> listAvailableProvidersAsync(String resourceGroupName, String networkWatcherName, AvailableProvidersListParameters parameters);
 
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<NetworkConfigurationDiagnosticResponse> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters);
+
 }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PacketCaptureResult.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PacketCaptureResult.java
index 682ee8b2ae28..d13f55095caa 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PacketCaptureResult.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PacketCaptureResult.java
@@ -95,9 +95,6 @@ interface Blank extends WithNetworkWatcher {
         interface WithNetworkWatcher {
            /**
             * Specifies resourceGroupName, networkWatcherName.
-            * @param resourceGroupName The name of the resource group
-            * @param networkWatcherName The name of the network watcher
-            * @return the next definition stage
             */
             WithStorageLocation withExistingNetworkWatcher(String resourceGroupName, String networkWatcherName);
         }
@@ -108,8 +105,6 @@ interface WithNetworkWatcher {
         interface WithStorageLocation {
            /**
             * Specifies storageLocation.
-            * @param storageLocation the storageLocation parameter value
-            * @return the next definition stage
             */
             WithTarget withStorageLocation(PacketCaptureStorageLocation storageLocation);
         }
@@ -120,8 +115,6 @@ interface WithStorageLocation {
         interface WithTarget {
            /**
             * Specifies target.
-            * @param target The ID of the targeted resource, only VM is currently supported
-            * @return the next definition stage
             */
             WithCreate withTarget(String target);
         }
@@ -132,8 +125,6 @@ interface WithTarget {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next definition stage
              */
             WithCreate withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -144,8 +135,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next definition stage
              */
             WithCreate withFilters(List<PacketCaptureFilter> filters);
         }
@@ -156,8 +145,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next definition stage
              */
             WithCreate withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -168,8 +155,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next definition stage
              */
             WithCreate withTotalBytesPerSession(Integer totalBytesPerSession);
         }
@@ -198,8 +183,6 @@ interface UpdateStages {
         interface WithBytesToCapturePerPacket {
             /**
              * Specifies bytesToCapturePerPacket.
-             * @param bytesToCapturePerPacket Number of bytes captured per packet, the remaining bytes are truncated
-             * @return the next update stage
              */
             Update withBytesToCapturePerPacket(Integer bytesToCapturePerPacket);
         }
@@ -210,8 +193,6 @@ interface WithBytesToCapturePerPacket {
         interface WithFilters {
             /**
              * Specifies filters.
-             * @param filters the filters parameter value
-             * @return the next update stage
              */
             Update withFilters(List<PacketCaptureFilter> filters);
         }
@@ -222,8 +203,6 @@ interface WithFilters {
         interface WithTimeLimitInSeconds {
             /**
              * Specifies timeLimitInSeconds.
-             * @param timeLimitInSeconds Maximum duration of the capture session in seconds
-             * @return the next update stage
              */
             Update withTimeLimitInSeconds(Integer timeLimitInSeconds);
         }
@@ -234,8 +213,6 @@ interface WithTimeLimitInSeconds {
         interface WithTotalBytesPerSession {
             /**
              * Specifies totalBytesPerSession.
-             * @param totalBytesPerSession Maximum size of the capture output
-             * @return the next update stage
              */
             Update withTotalBytesPerSession(Integer totalBytesPerSession);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PublicIPAddress.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PublicIPAddress.java
index cba9a26d402e..98de5e27cfb6 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PublicIPAddress.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/PublicIPAddress.java
@@ -108,133 +108,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify DnsSettings.
+         * The stage of the publicipaddress update allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next definition stage
              */
             WithCreate withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Etag.
+         * The stage of the publicipaddress update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next definition stage
              */
             WithCreate withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IpAddress.
+         * The stage of the publicipaddress update allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next definition stage
              */
             WithCreate withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify IpTags.
+         * The stage of the publicipaddress update allowing to specify IpTags.
          */
         interface WithIpTags {
             /**
              * Specifies ipTags.
-             * @param ipTags The list of tags associated with the public IP address
-             * @return the next definition stage
              */
             WithCreate withIpTags(List<IpTag> ipTags);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ProvisioningState.
+         * The stage of the publicipaddress update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next definition stage
              */
             WithCreate withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify ResourceGuid.
+         * The stage of the publicipaddress update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Sku.
+         * The stage of the publicipaddress update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next definition stage
              */
             WithCreate withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress definition allowing to specify Zones.
+         * The stage of the publicipaddress update allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -258,133 +236,111 @@ interface Update extends Appliable<PublicIPAddress>, Resource.UpdateWithTags<Upd
      */
     interface UpdateStages {
         /**
-         * The stage of the publicipaddress update allowing to specify DnsSettings.
+         * The stage of the publicipaddress {0} allowing to specify DnsSettings.
          */
         interface WithDnsSettings {
             /**
              * Specifies dnsSettings.
-             * @param dnsSettings The FQDN of the DNS record associated with the public IP address
-             * @return the next update stage
              */
             Update withDnsSettings(PublicIPAddressDnsSettings dnsSettings);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Etag.
+         * The stage of the publicipaddress {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IdleTimeoutInMinutes.
+         * The stage of the publicipaddress {0} allowing to specify IdleTimeoutInMinutes.
          */
         interface WithIdleTimeoutInMinutes {
             /**
              * Specifies idleTimeoutInMinutes.
-             * @param idleTimeoutInMinutes The idle timeout of the public IP address
-             * @return the next update stage
              */
             Update withIdleTimeoutInMinutes(Integer idleTimeoutInMinutes);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IpAddress.
+         * The stage of the publicipaddress {0} allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The IP address associated with the public IP address resource
-             * @return the next update stage
              */
             Update withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify IpTags.
+         * The stage of the publicipaddress {0} allowing to specify IpTags.
          */
         interface WithIpTags {
             /**
              * Specifies ipTags.
-             * @param ipTags The list of tags associated with the public IP address
-             * @return the next update stage
              */
             Update withIpTags(List<IpTag> ipTags);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ProvisioningState.
+         * The stage of the publicipaddress {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAddressVersion.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAddressVersion.
          */
         interface WithPublicIPAddressVersion {
             /**
              * Specifies publicIPAddressVersion.
-             * @param publicIPAddressVersion The public IP address version. Possible values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6'
-             * @return the next update stage
              */
             Update withPublicIPAddressVersion(IPVersion publicIPAddressVersion);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify PublicIPAllocationMethod.
+         * The stage of the publicipaddress {0} allowing to specify PublicIPAllocationMethod.
          */
         interface WithPublicIPAllocationMethod {
             /**
              * Specifies publicIPAllocationMethod.
-             * @param publicIPAllocationMethod The public IP allocation method. Possible values are: 'Static' and 'Dynamic'. Possible values include: 'Static', 'Dynamic'
-             * @return the next update stage
              */
             Update withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify ResourceGuid.
+         * The stage of the publicipaddress {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the public IP resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Sku.
+         * The stage of the publicipaddress {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The public IP address SKU
-             * @return the next update stage
              */
             Update withSku(PublicIPAddressSku sku);
         }
 
         /**
-         * The stage of the publicipaddress update allowing to specify Zones.
+         * The stage of the publicipaddress {0} allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
-             * @param zones A list of availability zones denoting the IP allocated for the resource needs to come from
-             * @return the next update stage
              */
             Update withZones(List<String> zones);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Route.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Route.java
index ec28fbaf89c1..9bae7c4a8565 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Route.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Route.java
@@ -79,9 +79,6 @@ interface Blank extends WithRouteTable {
         interface WithRouteTable {
            /**
             * Specifies resourceGroupName, routeTableName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeTableName The name of the route table
-            * @return the next definition stage
             */
             WithNextHopType withExistingRouteTable(String resourceGroupName, String routeTableName);
         }
@@ -92,8 +89,6 @@ interface WithRouteTable {
         interface WithNextHopType {
            /**
             * Specifies nextHopType.
-            * @param nextHopType The type of Azure hop the packet should be sent to. Possible values are: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', and 'None'. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'
-            * @return the next definition stage
             */
             WithCreate withNextHopType(RouteNextHopType nextHopType);
         }
@@ -104,8 +99,6 @@ interface WithNextHopType {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -116,8 +109,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -128,8 +119,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -140,8 +129,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -152,8 +139,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next definition stage
              */
             WithCreate withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -164,8 +149,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -194,8 +177,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The destination CIDR to which the route applies
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -206,8 +187,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -218,8 +197,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -230,8 +207,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -242,8 +217,6 @@ interface WithName {
         interface WithNextHopIpAddress {
             /**
              * Specifies nextHopIpAddress.
-             * @param nextHopIpAddress The IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance
-             * @return the next update stage
              */
             Update withNextHopIpAddress(String nextHopIpAddress);
         }
@@ -254,8 +227,6 @@ interface WithNextHopIpAddress {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilter.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilter.java
index 5d9380bc2dda..f072953da24a 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilter.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilter.java
@@ -70,25 +70,21 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Peerings.
+         * The stage of the routefilter update allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next definition stage
              */
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter definition allowing to specify Rules.
+         * The stage of the routefilter update allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next definition stage
              */
             WithCreate withRules(List<RouteFilterRuleInner> rules);
         }
@@ -112,25 +108,21 @@ interface Update extends Appliable<RouteFilter>, Resource.UpdateWithTags<Update>
      */
     interface UpdateStages {
         /**
-         * The stage of the routefilter update allowing to specify Peerings.
+         * The stage of the routefilter {0} allowing to specify Peerings.
          */
         interface WithPeerings {
             /**
              * Specifies peerings.
-             * @param peerings A collection of references to express route circuit peerings
-             * @return the next update stage
              */
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
         /**
-         * The stage of the routefilter update allowing to specify Rules.
+         * The stage of the routefilter {0} allowing to specify Rules.
          */
         interface WithRules {
             /**
              * Specifies rules.
-             * @param rules Collection of RouteFilterRules contained within a route filter
-             * @return the next update stage
              */
             Update withRules(List<RouteFilterRuleInner> rules);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilterRule.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilterRule.java
index 0f7751ee0fa4..629526606aee 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilterRule.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteFilterRule.java
@@ -85,9 +85,6 @@ interface Blank extends WithRouteFilter {
         interface WithRouteFilter {
            /**
             * Specifies resourceGroupName, routeFilterName.
-            * @param resourceGroupName The name of the resource group
-            * @param routeFilterName The name of the route filter
-            * @return the next definition stage
             */
             WithAccess withExistingRouteFilter(String resourceGroupName, String routeFilterName);
         }
@@ -98,8 +95,6 @@ interface WithRouteFilter {
         interface WithAccess {
            /**
             * Specifies access.
-            * @param access The access type of the rule. Valid values are: 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny'
-            * @return the next definition stage
             */
             WithCommunities withAccess(Access access);
         }
@@ -110,8 +105,6 @@ interface WithAccess {
         interface WithCommunities {
            /**
             * Specifies communities.
-            * @param communities The collection for bgp community values to filter on. e.g. ['12076:5010','12076:5020']
-            * @return the next definition stage
             */
             WithRouteFilterRuleType withCommunities(List<String> communities);
         }
@@ -122,8 +115,6 @@ interface WithCommunities {
         interface WithRouteFilterRuleType {
            /**
             * Specifies routeFilterRuleType.
-            * @param routeFilterRuleType The rule type of the rule. Valid value is: 'Community'
-            * @return the next definition stage
             */
             WithCreate withRouteFilterRuleType(String routeFilterRuleType);
         }
@@ -134,8 +125,6 @@ interface WithRouteFilterRuleType {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -146,8 +135,6 @@ interface WithId {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -158,8 +145,6 @@ interface WithLocation {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -188,8 +173,6 @@ interface UpdateStages {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteTable.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteTable.java
index 0b1507b23594..e512da456159 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteTable.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/RouteTable.java
@@ -74,49 +74,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the routetable definition allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next definition stage
              */
             WithCreate withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Etag.
+         * The stage of the routetable update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify ProvisioningState.
+         * The stage of the routetable update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable definition allowing to specify Routes.
+         * The stage of the routetable update allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next definition stage
              */
             WithCreate withRoutes(List<RouteInner> routes);
         }
@@ -140,49 +132,41 @@ interface Update extends Appliable<RouteTable>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the routetable update allowing to specify DisableBgpRoutePropagation.
+         * The stage of the routetable {0} allowing to specify DisableBgpRoutePropagation.
          */
         interface WithDisableBgpRoutePropagation {
             /**
              * Specifies disableBgpRoutePropagation.
-             * @param disableBgpRoutePropagation Gets or sets whether to disable the routes learned by BGP on that route table. True means disable
-             * @return the next update stage
              */
             Update withDisableBgpRoutePropagation(Boolean disableBgpRoutePropagation);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Etag.
+         * The stage of the routetable {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the routetable update allowing to specify ProvisioningState.
+         * The stage of the routetable {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the routetable update allowing to specify Routes.
+         * The stage of the routetable {0} allowing to specify Routes.
          */
         interface WithRoutes {
             /**
              * Specifies routes.
-             * @param routes Collection of routes contained within a route table
-             * @return the next update stage
              */
             Update withRoutes(List<RouteInner> routes);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Subnet.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Subnet.java
index 5d22f66f66ed..dd7dae71d517 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Subnet.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/Subnet.java
@@ -97,9 +97,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -110,8 +107,6 @@ interface WithVirtualNetwork {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
@@ -122,8 +117,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -134,8 +127,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -146,8 +137,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -158,8 +147,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next definition stage
              */
             WithCreate withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -170,8 +157,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -182,8 +167,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next definition stage
              */
             WithCreate withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -194,8 +177,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next definition stage
              */
             WithCreate withRouteTable(RouteTableInner routeTable);
         }
@@ -206,8 +187,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next definition stage
              */
             WithCreate withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
@@ -236,8 +215,6 @@ interface UpdateStages {
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix The address prefix for the subnet
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
@@ -248,8 +225,6 @@ interface WithAddressPrefix {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -260,8 +235,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -272,8 +245,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -284,8 +255,6 @@ interface WithName {
         interface WithNetworkSecurityGroup {
             /**
              * Specifies networkSecurityGroup.
-             * @param networkSecurityGroup The reference of the NetworkSecurityGroup resource
-             * @return the next update stage
              */
             Update withNetworkSecurityGroup(NetworkSecurityGroupInner networkSecurityGroup);
         }
@@ -296,8 +265,6 @@ interface WithNetworkSecurityGroup {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -308,8 +275,6 @@ interface WithProvisioningState {
         interface WithResourceNavigationLinks {
             /**
              * Specifies resourceNavigationLinks.
-             * @param resourceNavigationLinks Gets an array of references to the external resources using subnet
-             * @return the next update stage
              */
             Update withResourceNavigationLinks(List<ResourceNavigationLink> resourceNavigationLinks);
         }
@@ -320,8 +285,6 @@ interface WithResourceNavigationLinks {
         interface WithRouteTable {
             /**
              * Specifies routeTable.
-             * @param routeTable The reference of the RouteTable resource
-             * @return the next update stage
              */
             Update withRouteTable(RouteTableInner routeTable);
         }
@@ -332,8 +295,6 @@ interface WithRouteTable {
         interface WithServiceEndpoints {
             /**
              * Specifies serviceEndpoints.
-             * @param serviceEndpoints An array of service endpoints
-             * @return the next update stage
              */
             Update withServiceEndpoints(List<ServiceEndpointPropertiesFormat> serviceEndpoints);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java
new file mode 100644
index 000000000000..e7e6df6da5e8
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/TrafficQuery.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Parameters to compare with network configuration.
+ */
+public class TrafficQuery {
+    /**
+     * The direction of the traffic. Accepted values are 'Inbound' and
+     * 'Outbound'. Possible values include: 'Inbound', 'Outbound'.
+     */
+    @JsonProperty(value = "direction", required = true)
+    private Direction direction;
+
+    /**
+     * Protocol to be verified on. Accepted values are '*', TCP, UDP.
+     */
+    @JsonProperty(value = "protocol", required = true)
+    private String protocol;
+
+    /**
+     * Traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     */
+    @JsonProperty(value = "source", required = true)
+    private String source;
+
+    /**
+     * Traffic destination. Accepted values are: '*', IP Address/CIDR, Service
+     * Tag.
+     */
+    @JsonProperty(value = "destination", required = true)
+    private String destination;
+
+    /**
+     * Traffice destination port. Accepted values are '*', port (for example,
+     * 3389) and port range (for example, 80-100).
+     */
+    @JsonProperty(value = "destinationPort", required = true)
+    private String destinationPort;
+
+    /**
+     * Get the direction of the traffic. Accepted values are 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @return the direction value
+     */
+    public Direction direction() {
+        return this.direction;
+    }
+
+    /**
+     * Set the direction of the traffic. Accepted values are 'Inbound' and 'Outbound'. Possible values include: 'Inbound', 'Outbound'.
+     *
+     * @param direction the direction value to set
+     * @return the TrafficQuery object itself.
+     */
+    public TrafficQuery withDirection(Direction direction) {
+        this.direction = direction;
+        return this;
+    }
+
+    /**
+     * Get protocol to be verified on. Accepted values are '*', TCP, UDP.
+     *
+     * @return the protocol value
+     */
+    public String protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set protocol to be verified on. Accepted values are '*', TCP, UDP.
+     *
+     * @param protocol the protocol value to set
+     * @return the TrafficQuery object itself.
+     */
+    public TrafficQuery withProtocol(String protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     *
+     * @return the source value
+     */
+    public String source() {
+        return this.source;
+    }
+
+    /**
+     * Set traffic source. Accepted values are '*', IP Address/CIDR, Service Tag.
+     *
+     * @param source the source value to set
+     * @return the TrafficQuery object itself.
+     */
+    public TrafficQuery withSource(String source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * Get traffic destination. Accepted values are: '*', IP Address/CIDR, Service Tag.
+     *
+     * @return the destination value
+     */
+    public String destination() {
+        return this.destination;
+    }
+
+    /**
+     * Set traffic destination. Accepted values are: '*', IP Address/CIDR, Service Tag.
+     *
+     * @param destination the destination value to set
+     * @return the TrafficQuery object itself.
+     */
+    public TrafficQuery withDestination(String destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * Get traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100).
+     *
+     * @return the destinationPort value
+     */
+    public String destinationPort() {
+        return this.destinationPort;
+    }
+
+    /**
+     * Set traffice destination port. Accepted values are '*', port (for example, 3389) and port range (for example, 80-100).
+     *
+     * @param destinationPort the destinationPort value to set
+     * @return the TrafficQuery object itself.
+     */
+    public TrafficQuery withDestinationPort(String destinationPort) {
+        this.destinationPort = destinationPort;
+        return this;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualHub.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualHub.java
index 31a02287cb43..b07255ef8087 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualHub.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualHub.java
@@ -75,49 +75,41 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify AddressPrefix.
+         * The stage of the virtualhub update allowing to specify AddressPrefix.
          */
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix Address-prefix for this VirtualHub
-             * @return the next definition stage
              */
             WithCreate withAddressPrefix(String addressPrefix);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify HubVirtualNetworkConnections.
+         * The stage of the virtualhub update allowing to specify HubVirtualNetworkConnections.
          */
         interface WithHubVirtualNetworkConnections {
             /**
              * Specifies hubVirtualNetworkConnections.
-             * @param hubVirtualNetworkConnections list of all vnet connections with this VirtualHub
-             * @return the next definition stage
              */
             WithCreate withHubVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> hubVirtualNetworkConnections);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify ProvisioningState.
+         * The stage of the virtualhub update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the virtualhub definition allowing to specify VirtualWan.
+         * The stage of the virtualhub update allowing to specify VirtualWan.
          */
         interface WithVirtualWan {
             /**
              * Specifies virtualWan.
-             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualWan(SubResource virtualWan);
         }
@@ -141,49 +133,41 @@ interface Update extends Appliable<VirtualHub>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualhub update allowing to specify AddressPrefix.
+         * The stage of the virtualhub {0} allowing to specify AddressPrefix.
          */
         interface WithAddressPrefix {
             /**
              * Specifies addressPrefix.
-             * @param addressPrefix Address-prefix for this VirtualHub
-             * @return the next update stage
              */
             Update withAddressPrefix(String addressPrefix);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify HubVirtualNetworkConnections.
+         * The stage of the virtualhub {0} allowing to specify HubVirtualNetworkConnections.
          */
         interface WithHubVirtualNetworkConnections {
             /**
              * Specifies hubVirtualNetworkConnections.
-             * @param hubVirtualNetworkConnections list of all vnet connections with this VirtualHub
-             * @return the next update stage
              */
             Update withHubVirtualNetworkConnections(List<HubVirtualNetworkConnectionInner> hubVirtualNetworkConnections);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify ProvisioningState.
+         * The stage of the virtualhub {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the virtualhub update allowing to specify VirtualWan.
+         * The stage of the virtualhub {0} allowing to specify VirtualWan.
          */
         interface WithVirtualWan {
             /**
              * Specifies virtualWan.
-             * @param virtualWan The VirtualWAN to which the VirtualHub belongs
-             * @return the next update stage
              */
             Update withVirtualWan(SubResource virtualWan);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetwork.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetwork.java
index 0285d87088a4..dce787a32391 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetwork.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetwork.java
@@ -101,121 +101,101 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify AddressSpace.
+         * The stage of the virtualnetwork update allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next definition stage
              */
             WithCreate withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify DdosProtectionPlan.
+         * The stage of the virtualnetwork update allowing to specify DdosProtectionPlan.
          */
         interface WithDdosProtectionPlan {
             /**
              * Specifies ddosProtectionPlan.
-             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
-             * @return the next definition stage
              */
             WithCreate withDdosProtectionPlan(SubResource ddosProtectionPlan);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next definition stage
              */
             WithCreate withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
-             * @return the next definition stage
              */
             WithCreate withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
-             * @return the next definition stage
              */
             WithCreate withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Etag.
+         * The stage of the virtualnetwork update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify Subnets.
+         * The stage of the virtualnetwork update allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork definition allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
@@ -239,121 +219,101 @@ interface Update extends Appliable<VirtualNetwork>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetwork update allowing to specify AddressSpace.
+         * The stage of the virtualnetwork {0} allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges that can be used by subnets
-             * @return the next update stage
              */
             Update withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify DdosProtectionPlan.
+         * The stage of the virtualnetwork {0} allowing to specify DdosProtectionPlan.
          */
         interface WithDdosProtectionPlan {
             /**
              * Specifies ddosProtectionPlan.
-             * @param ddosProtectionPlan The DDoS protection plan associated with the virtual network
-             * @return the next update stage
              */
             Update withDdosProtectionPlan(SubResource ddosProtectionPlan);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify DhcpOptions.
+         * The stage of the virtualnetwork {0} allowing to specify DhcpOptions.
          */
         interface WithDhcpOptions {
             /**
              * Specifies dhcpOptions.
-             * @param dhcpOptions The dhcpOptions that contains an array of DNS servers available to VMs deployed in the virtual network
-             * @return the next update stage
              */
             Update withDhcpOptions(DhcpOptions dhcpOptions);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableDdosProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableDdosProtection.
          */
         interface WithEnableDdosProtection {
             /**
              * Specifies enableDdosProtection.
-             * @param enableDdosProtection Indicates if DDoS protection is enabled for all the protected resources in the virtual network. It requires a DDoS protection plan associated with the resource
-             * @return the next update stage
              */
             Update withEnableDdosProtection(Boolean enableDdosProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify EnableVmProtection.
+         * The stage of the virtualnetwork {0} allowing to specify EnableVmProtection.
          */
         interface WithEnableVmProtection {
             /**
              * Specifies enableVmProtection.
-             * @param enableVmProtection Indicates if VM protection is enabled for all the subnets in the virtual network
-             * @return the next update stage
              */
             Update withEnableVmProtection(Boolean enableVmProtection);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Etag.
+         * The stage of the virtualnetwork {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ProvisioningState.
+         * The stage of the virtualnetwork {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify ResourceGuid.
+         * The stage of the virtualnetwork {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resourceGuid property of the Virtual Network resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify Subnets.
+         * The stage of the virtualnetwork {0} allowing to specify Subnets.
          */
         interface WithSubnets {
             /**
              * Specifies subnets.
-             * @param subnets A list of subnets in a Virtual Network
-             * @return the next update stage
              */
             Update withSubnets(List<SubnetInner> subnets);
         }
 
         /**
-         * The stage of the virtualnetwork update allowing to specify VirtualNetworkPeerings.
+         * The stage of the virtualnetwork {0} allowing to specify VirtualNetworkPeerings.
          */
         interface WithVirtualNetworkPeerings {
             /**
              * Specifies virtualNetworkPeerings.
-             * @param virtualNetworkPeerings A list of peerings in a Virtual Network
-             * @return the next update stage
              */
             Update withVirtualNetworkPeerings(List<VirtualNetworkPeeringInner> virtualNetworkPeerings);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateway.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateway.java
index b2aefe3fd3eb..5e2119bc1296 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateway.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateway.java
@@ -109,133 +109,111 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next definition stage
              */
             WithCreate withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Etag.
+         * The stage of the virtualnetworkgateway update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next definition stage
              */
             WithCreate withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next definition stage
              */
             WithCreate withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify Sku.
+         * The stage of the virtualnetworkgateway update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next definition stage
              */
             WithCreate withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next definition stage
              */
             WithCreate withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway definition allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next definition stage
              */
             WithCreate withVpnType(VpnType vpnType);
         }
@@ -259,133 +237,111 @@ interface Update extends Appliable<VirtualNetworkGateway>, Resource.UpdateWithTa
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ActiveActive.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ActiveActive.
          */
         interface WithActiveActive {
             /**
              * Specifies activeActive.
-             * @param activeActive ActiveActive flag
-             * @return the next update stage
              */
             Update withActiveActive(Boolean activeActive);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify BgpSettings.
+         * The stage of the virtualnetworkgateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Virtual network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgateway {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp Whether BGP is enabled for this virtual network gateway or not
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Etag.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayDefaultSite.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayDefaultSite.
          */
         interface WithGatewayDefaultSite {
             /**
              * Specifies gatewayDefaultSite.
-             * @param gatewayDefaultSite The reference of the LocalNetworkGateway resource which represents local network site having default routes. Assign Null value in case of removing existing default site setting
-             * @return the next update stage
              */
             Update withGatewayDefaultSite(SubResource gatewayDefaultSite);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify GatewayType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify GatewayType.
          */
         interface WithGatewayType {
             /**
              * Specifies gatewayType.
-             * @param gatewayType The type of this virtual network gateway. Possible values are: 'Vpn' and 'ExpressRoute'. Possible values include: 'Vpn', 'ExpressRoute'
-             * @return the next update stage
              */
             Update withGatewayType(VirtualNetworkGatewayType gatewayType);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify IpConfigurations.
+         * The stage of the virtualnetworkgateway {0} allowing to specify IpConfigurations.
          */
         interface WithIpConfigurations {
             /**
              * Specifies ipConfigurations.
-             * @param ipConfigurations IP configurations for virtual network gateway
-             * @return the next update stage
              */
             Update withIpConfigurations(List<VirtualNetworkGatewayIPConfiguration> ipConfigurations);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgateway {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGateway resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify Sku.
+         * The stage of the virtualnetworkgateway {0} allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
-             * @param sku The reference of the VirtualNetworkGatewaySku resource which represents the SKU selected for Virtual network gateway
-             * @return the next update stage
              */
             Update withSku(VirtualNetworkGatewaySku sku);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnClientConfiguration.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnClientConfiguration.
          */
         interface WithVpnClientConfiguration {
             /**
              * Specifies vpnClientConfiguration.
-             * @param vpnClientConfiguration The reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations
-             * @return the next update stage
              */
             Update withVpnClientConfiguration(VpnClientConfiguration vpnClientConfiguration);
         }
 
         /**
-         * The stage of the virtualnetworkgateway update allowing to specify VpnType.
+         * The stage of the virtualnetworkgateway {0} allowing to specify VpnType.
          */
         interface WithVpnType {
             /**
              * Specifies vpnType.
-             * @param vpnType The type of this virtual network gateway. Possible values are: 'PolicyBased' and 'RouteBased'. Possible values include: 'PolicyBased', 'RouteBased'
-             * @return the next update stage
              */
             Update withVpnType(VpnType vpnType);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java
index 10838f36c28c..1515c4551a3c 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGatewayConnection.java
@@ -146,9 +146,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithConnectionType {
            /**
             * Specifies connectionType.
-            * @param connectionType Gateway connection type. Possible values are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'
-            * @return the next definition stage
-*/
+            */
             WithVirtualNetworkGateway1 withConnectionType(VirtualNetworkGatewayConnectionType connectionType);
         }
 
@@ -158,140 +156,116 @@ interface WithConnectionType {
         interface WithVirtualNetworkGateway1 {
            /**
             * Specifies virtualNetworkGateway1.
-            * @param virtualNetworkGateway1 The reference to virtual network gateway resource
-            * @return the next definition stage
-*/
+            */
             WithCreate withVirtualNetworkGateway1(VirtualNetworkGatewayInner virtualNetworkGateway1);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next definition stage
              */
             WithCreate withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next definition stage
              */
             WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next definition stage
              */
             WithCreate withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next definition stage
              */
             WithCreate withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next definition stage
              */
             WithCreate withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next definition stage
              */
             WithCreate withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next definition stage
              */
             WithCreate withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection definition allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next definition stage
              */
             WithCreate withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
@@ -315,133 +289,111 @@ interface Update extends Appliable<VirtualNetworkGatewayConnection>, Resource.Up
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify AuthorizationKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify AuthorizationKey.
          */
         interface WithAuthorizationKey {
             /**
              * Specifies authorizationKey.
-             * @param authorizationKey The authorizationKey
-             * @return the next update stage
              */
             Update withAuthorizationKey(String authorizationKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify EnableBgp.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify EnableBgp.
          */
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Etag.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Etag.
          */
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify IpsecPolicies.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify IpsecPolicies.
          */
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next update stage
              */
             Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify LocalNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify LocalNetworkGateway2.
          */
         interface WithLocalNetworkGateway2 {
             /**
              * Specifies localNetworkGateway2.
-             * @param localNetworkGateway2 The reference to local network gateway resource
-             * @return the next update stage
              */
             Update withLocalNetworkGateway2(LocalNetworkGatewayInner localNetworkGateway2);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify Peer.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify Peer.
          */
         interface WithPeer {
             /**
              * Specifies peer.
-             * @param peer The reference to peerings resource
-             * @return the next update stage
              */
             Update withPeer(SubResource peer);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify ResourceGuid.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify ResourceGuid.
          */
         interface WithResourceGuid {
             /**
              * Specifies resourceGuid.
-             * @param resourceGuid The resource GUID property of the VirtualNetworkGatewayConnection resource
-             * @return the next update stage
              */
             Update withResourceGuid(String resourceGuid);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify RoutingWeight.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify RoutingWeight.
          */
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight The routing weight
-             * @return the next update stage
              */
             Update withRoutingWeight(Integer routingWeight);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify SharedKey.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify SharedKey.
          */
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey The IPSec shared key
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify UsePolicyBasedTrafficSelectors.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify UsePolicyBasedTrafficSelectors.
          */
         interface WithUsePolicyBasedTrafficSelectors {
             /**
              * Specifies usePolicyBasedTrafficSelectors.
-             * @param usePolicyBasedTrafficSelectors Enable policy-based traffic selectors
-             * @return the next update stage
              */
             Update withUsePolicyBasedTrafficSelectors(Boolean usePolicyBasedTrafficSelectors);
         }
 
         /**
-         * The stage of the virtualnetworkgatewayconnection update allowing to specify VirtualNetworkGateway2.
+         * The stage of the virtualnetworkgatewayconnection {0} allowing to specify VirtualNetworkGateway2.
          */
         interface WithVirtualNetworkGateway2 {
             /**
              * Specifies virtualNetworkGateway2.
-             * @param virtualNetworkGateway2 The reference to virtual network gateway resource
-             * @return the next update stage
              */
             Update withVirtualNetworkGateway2(VirtualNetworkGatewayInner virtualNetworkGateway2);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateways.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateways.java
index 2d4cdfa896bb..394db18d0a0b 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateways.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkGateways.java
@@ -34,6 +34,16 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
      */
     Observable<VirtualNetworkGateway> resetAsync(String resourceGroupName, String virtualNetworkGatewayName);
 
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName);
+
     /**
      * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
      *
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkPeering.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkPeering.java
index 6f02e04684f7..57c8dcc251d4 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkPeering.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualNetworkPeering.java
@@ -100,9 +100,6 @@ interface Blank extends WithVirtualNetwork {
         interface WithVirtualNetwork {
            /**
             * Specifies resourceGroupName, virtualNetworkName.
-            * @param resourceGroupName The name of the resource group
-            * @param virtualNetworkName The name of the virtual network
-            * @return the next definition stage
             */
             WithCreate withExistingVirtualNetwork(String resourceGroupName, String virtualNetworkName);
         }
@@ -113,8 +110,6 @@ interface WithVirtualNetwork {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next definition stage
              */
             WithCreate withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -125,8 +120,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next definition stage
              */
             WithCreate withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -137,8 +130,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next definition stage
              */
             WithCreate withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -149,8 +140,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next definition stage
              */
             WithCreate withEtag(String etag);
         }
@@ -161,8 +150,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -173,8 +160,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next definition stage
              */
             WithCreate withName(String name);
         }
@@ -185,8 +170,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next definition stage
              */
             WithCreate withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -197,8 +180,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(String provisioningState);
         }
@@ -209,8 +190,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next definition stage
              */
             WithCreate withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -221,8 +200,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next definition stage
              */
             WithCreate withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -233,8 +210,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next definition stage
              */
             WithCreate withUseRemoteGateways(Boolean useRemoteGateways);
         }
@@ -263,8 +238,6 @@ interface UpdateStages {
         interface WithAllowForwardedTraffic {
             /**
              * Specifies allowForwardedTraffic.
-             * @param allowForwardedTraffic Whether the forwarded traffic from the VMs in the remote virtual network will be allowed/disallowed
-             * @return the next update stage
              */
             Update withAllowForwardedTraffic(Boolean allowForwardedTraffic);
         }
@@ -275,8 +248,6 @@ interface WithAllowForwardedTraffic {
         interface WithAllowGatewayTransit {
             /**
              * Specifies allowGatewayTransit.
-             * @param allowGatewayTransit If gateway links can be used in remote virtual networking to link to this virtual network
-             * @return the next update stage
              */
             Update withAllowGatewayTransit(Boolean allowGatewayTransit);
         }
@@ -287,8 +258,6 @@ interface WithAllowGatewayTransit {
         interface WithAllowVirtualNetworkAccess {
             /**
              * Specifies allowVirtualNetworkAccess.
-             * @param allowVirtualNetworkAccess Whether the VMs in the linked virtual network space would be able to access all the VMs in local Virtual network space
-             * @return the next update stage
              */
             Update withAllowVirtualNetworkAccess(Boolean allowVirtualNetworkAccess);
         }
@@ -299,8 +268,6 @@ interface WithAllowVirtualNetworkAccess {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag A unique read-only string that changes whenever the resource is updated
-             * @return the next update stage
              */
             Update withEtag(String etag);
         }
@@ -311,8 +278,6 @@ interface WithEtag {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -323,8 +288,6 @@ interface WithId {
         interface WithName {
             /**
              * Specifies name.
-             * @param name The name of the resource that is unique within a resource group. This name can be used to access the resource
-             * @return the next update stage
              */
             Update withName(String name);
         }
@@ -335,8 +298,6 @@ interface WithName {
         interface WithPeeringState {
             /**
              * Specifies peeringState.
-             * @param peeringState The status of the virtual network peering. Possible values are 'Initiated', 'Connected', and 'Disconnected'. Possible values include: 'Initiated', 'Connected', 'Disconnected'
-             * @return the next update stage
              */
             Update withPeeringState(VirtualNetworkPeeringState peeringState);
         }
@@ -347,8 +308,6 @@ interface WithPeeringState {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource
-             * @return the next update stage
              */
             Update withProvisioningState(String provisioningState);
         }
@@ -359,8 +318,6 @@ interface WithProvisioningState {
         interface WithRemoteAddressSpace {
             /**
              * Specifies remoteAddressSpace.
-             * @param remoteAddressSpace The reference of the remote virtual network address space
-             * @return the next update stage
              */
             Update withRemoteAddressSpace(AddressSpace remoteAddressSpace);
         }
@@ -371,8 +328,6 @@ interface WithRemoteAddressSpace {
         interface WithRemoteVirtualNetwork {
             /**
              * Specifies remoteVirtualNetwork.
-             * @param remoteVirtualNetwork The reference of the remote virtual network. The remote virtual network can be in the same or different region (preview). See here to register for the preview and learn more (https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering)
-             * @return the next update stage
              */
             Update withRemoteVirtualNetwork(SubResource remoteVirtualNetwork);
         }
@@ -383,8 +338,6 @@ interface WithRemoteVirtualNetwork {
         interface WithUseRemoteGateways {
             /**
              * Specifies useRemoteGateways.
-             * @param useRemoteGateways If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway
-             * @return the next update stage
              */
             Update withUseRemoteGateways(Boolean useRemoteGateways);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualWAN.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualWAN.java
index 80c9acfde9ab..a1245122d2dc 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualWAN.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VirtualWAN.java
@@ -74,25 +74,21 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the virtualwan definition allowing to specify DisableVpnEncryption.
+         * The stage of the virtualwan update allowing to specify DisableVpnEncryption.
          */
         interface WithDisableVpnEncryption {
             /**
              * Specifies disableVpnEncryption.
-             * @param disableVpnEncryption Vpn encryption to be disabled or not
-             * @return the next definition stage
              */
             WithCreate withDisableVpnEncryption(Boolean disableVpnEncryption);
         }
 
         /**
-         * The stage of the virtualwan definition allowing to specify ProvisioningState.
+         * The stage of the virtualwan update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -116,25 +112,21 @@ interface Update extends Appliable<VirtualWAN>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualwan update allowing to specify DisableVpnEncryption.
+         * The stage of the virtualwan {0} allowing to specify DisableVpnEncryption.
          */
         interface WithDisableVpnEncryption {
             /**
              * Specifies disableVpnEncryption.
-             * @param disableVpnEncryption Vpn encryption to be disabled or not
-             * @return the next update stage
              */
             Update withDisableVpnEncryption(Boolean disableVpnEncryption);
         }
 
         /**
-         * The stage of the virtualwan update allowing to specify ProvisioningState.
+         * The stage of the virtualwan {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnConnection.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnConnection.java
index c04dcb2b0ad4..f65e935ee40f 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnConnection.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnConnection.java
@@ -127,9 +127,6 @@ interface Blank extends WithVpnGateway {
         interface WithVpnGateway {
            /**
             * Specifies resourceGroupName, gatewayName.
-            * @param resourceGroupName The resource group name of the VpnGateway
-            * @param gatewayName The name of the gateway
-            * @return the next definition stage
             */
             WithCreate withExistingVpnGateway(String resourceGroupName, String gatewayName);
         }
@@ -140,8 +137,6 @@ interface WithVpnGateway {
         interface WithConnectionStatus {
             /**
              * Specifies connectionStatus.
-             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
-             * @return the next definition stage
              */
             WithCreate withConnectionStatus(VpnConnectionStatus connectionStatus);
         }
@@ -152,8 +147,6 @@ interface WithConnectionStatus {
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next definition stage
              */
             WithCreate withEnableBgp(Boolean enableBgp);
         }
@@ -164,8 +157,6 @@ interface WithEnableBgp {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next definition stage
              */
             WithCreate withId(String id);
         }
@@ -176,8 +167,6 @@ interface WithId {
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next definition stage
              */
             WithCreate withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
@@ -188,8 +177,6 @@ interface WithIpsecPolicies {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next definition stage
              */
             WithCreate withLocation(String location);
         }
@@ -200,8 +187,6 @@ interface WithLocation {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
@@ -212,8 +197,6 @@ interface WithProvisioningState {
         interface WithRemoteVpnSite {
             /**
              * Specifies remoteVpnSite.
-             * @param remoteVpnSite Id of the connected vpn site
-             * @return the next definition stage
              */
             WithCreate withRemoteVpnSite(SubResource remoteVpnSite);
         }
@@ -224,8 +207,6 @@ interface WithRemoteVpnSite {
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight routing weight for vpn connection
-             * @return the next definition stage
              */
             WithCreate withRoutingWeight(Integer routingWeight);
         }
@@ -236,8 +217,6 @@ interface WithRoutingWeight {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey SharedKey for the vpn connection
-             * @return the next definition stage
              */
             WithCreate withSharedKey(String sharedKey);
         }
@@ -248,8 +227,6 @@ interface WithSharedKey {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next definition stage
              */
             WithCreate withTags(Map<String, String> tags);
         }
@@ -278,8 +255,6 @@ interface UpdateStages {
         interface WithConnectionStatus {
             /**
              * Specifies connectionStatus.
-             * @param connectionStatus The connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
-             * @return the next update stage
              */
             Update withConnectionStatus(VpnConnectionStatus connectionStatus);
         }
@@ -290,8 +265,6 @@ interface WithConnectionStatus {
         interface WithEnableBgp {
             /**
              * Specifies enableBgp.
-             * @param enableBgp EnableBgp flag
-             * @return the next update stage
              */
             Update withEnableBgp(Boolean enableBgp);
         }
@@ -302,8 +275,6 @@ interface WithEnableBgp {
         interface WithId {
             /**
              * Specifies id.
-             * @param id Resource ID
-             * @return the next update stage
              */
             Update withId(String id);
         }
@@ -314,8 +285,6 @@ interface WithId {
         interface WithIpsecPolicies {
             /**
              * Specifies ipsecPolicies.
-             * @param ipsecPolicies The IPSec Policies to be considered by this connection
-             * @return the next update stage
              */
             Update withIpsecPolicies(List<IpsecPolicy> ipsecPolicies);
         }
@@ -326,8 +295,6 @@ interface WithIpsecPolicies {
         interface WithLocation {
             /**
              * Specifies location.
-             * @param location Resource location
-             * @return the next update stage
              */
             Update withLocation(String location);
         }
@@ -338,8 +305,6 @@ interface WithLocation {
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
@@ -350,8 +315,6 @@ interface WithProvisioningState {
         interface WithRemoteVpnSite {
             /**
              * Specifies remoteVpnSite.
-             * @param remoteVpnSite Id of the connected vpn site
-             * @return the next update stage
              */
             Update withRemoteVpnSite(SubResource remoteVpnSite);
         }
@@ -362,8 +325,6 @@ interface WithRemoteVpnSite {
         interface WithRoutingWeight {
             /**
              * Specifies routingWeight.
-             * @param routingWeight routing weight for vpn connection
-             * @return the next update stage
              */
             Update withRoutingWeight(Integer routingWeight);
         }
@@ -374,8 +335,6 @@ interface WithRoutingWeight {
         interface WithSharedKey {
             /**
              * Specifies sharedKey.
-             * @param sharedKey SharedKey for the vpn connection
-             * @return the next update stage
              */
             Update withSharedKey(String sharedKey);
         }
@@ -386,8 +345,6 @@ interface WithSharedKey {
         interface WithTags {
             /**
              * Specifies tags.
-             * @param tags Resource tags
-             * @return the next update stage
              */
             Update withTags(Map<String, String> tags);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnGateway.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnGateway.java
index 2c9b358912d3..f6b7f685d748 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnGateway.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnGateway.java
@@ -80,61 +80,51 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify BgpSettings.
+         * The stage of the vpngateway update allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next definition stage
              */
             WithCreate withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify Connections.
+         * The stage of the vpngateway update allowing to specify Connections.
          */
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections list of all vpn connections to the gateway
-             * @return the next definition stage
              */
             WithCreate withConnections(List<VpnConnectionInner> connections);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify Policies.
+         * The stage of the vpngateway update allowing to specify Policies.
          */
         interface WithPolicies {
             /**
              * Specifies policies.
-             * @param policies The policies applied to this vpn gateway
-             * @return the next definition stage
              */
             WithCreate withPolicies(Policies policies);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify ProvisioningState.
+         * The stage of the vpngateway update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpngateway definition allowing to specify VirtualHub.
+         * The stage of the vpngateway update allowing to specify VirtualHub.
          */
         interface WithVirtualHub {
             /**
              * Specifies virtualHub.
-             * @param virtualHub The VirtualHub to which the gateway belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualHub(SubResource virtualHub);
         }
@@ -158,61 +148,51 @@ interface Update extends Appliable<VpnGateway>, Resource.UpdateWithTags<Update>,
      */
     interface UpdateStages {
         /**
-         * The stage of the vpngateway update allowing to specify BgpSettings.
+         * The stage of the vpngateway {0} allowing to specify BgpSettings.
          */
         interface WithBgpSettings {
             /**
              * Specifies bgpSettings.
-             * @param bgpSettings Local network gateway's BGP speaker settings
-             * @return the next update stage
              */
             Update withBgpSettings(BgpSettings bgpSettings);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify Connections.
+         * The stage of the vpngateway {0} allowing to specify Connections.
          */
         interface WithConnections {
             /**
              * Specifies connections.
-             * @param connections list of all vpn connections to the gateway
-             * @return the next update stage
              */
             Update withConnections(List<VpnConnectionInner> connections);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify Policies.
+         * The stage of the vpngateway {0} allowing to specify Policies.
          */
         interface WithPolicies {
             /**
              * Specifies policies.
-             * @param policies The policies applied to this vpn gateway
-             * @return the next update stage
              */
             Update withPolicies(Policies policies);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify ProvisioningState.
+         * The stage of the vpngateway {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpngateway update allowing to specify VirtualHub.
+         * The stage of the vpngateway {0} allowing to specify VirtualHub.
          */
         interface WithVirtualHub {
             /**
              * Specifies virtualHub.
-             * @param virtualHub The VirtualHub to which the gateway belongs
-             * @return the next update stage
              */
             Update withVirtualHub(SubResource virtualHub);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnSite.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnSite.java
index 4cac494a3994..9d9221f14af6 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnSite.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/VpnSite.java
@@ -88,85 +88,71 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify AddressSpace.
+         * The stage of the vpnsite update allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges
-             * @return the next definition stage
              */
             WithCreate withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify BgpProperties.
+         * The stage of the vpnsite update allowing to specify BgpProperties.
          */
         interface WithBgpProperties {
             /**
              * Specifies bgpProperties.
-             * @param bgpProperties The set of bgp properties
-             * @return the next definition stage
              */
             WithCreate withBgpProperties(BgpSettings bgpProperties);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify DeviceProperties.
+         * The stage of the vpnsite update allowing to specify DeviceProperties.
          */
         interface WithDeviceProperties {
             /**
              * Specifies deviceProperties.
-             * @param deviceProperties The device properties
-             * @return the next definition stage
              */
             WithCreate withDeviceProperties(DeviceProperties deviceProperties);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify IpAddress.
+         * The stage of the vpnsite update allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The ip-address for the vpn-site
-             * @return the next definition stage
              */
             WithCreate withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify ProvisioningState.
+         * The stage of the vpnsite update allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next definition stage
              */
             WithCreate withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify SiteKey.
+         * The stage of the vpnsite update allowing to specify SiteKey.
          */
         interface WithSiteKey {
             /**
              * Specifies siteKey.
-             * @param siteKey The key for vpn-site that can be used for connections
-             * @return the next definition stage
              */
             WithCreate withSiteKey(String siteKey);
         }
 
         /**
-         * The stage of the vpnsite definition allowing to specify VirtualWAN.
+         * The stage of the vpnsite update allowing to specify VirtualWAN.
          */
         interface WithVirtualWAN {
             /**
              * Specifies virtualWAN.
-             * @param virtualWAN The VirtualWAN to which the vpnSite belongs
-             * @return the next definition stage
              */
             WithCreate withVirtualWAN(SubResource virtualWAN);
         }
@@ -190,85 +176,71 @@ interface Update extends Appliable<VpnSite>, Resource.UpdateWithTags<Update>, Up
      */
     interface UpdateStages {
         /**
-         * The stage of the vpnsite update allowing to specify AddressSpace.
+         * The stage of the vpnsite {0} allowing to specify AddressSpace.
          */
         interface WithAddressSpace {
             /**
              * Specifies addressSpace.
-             * @param addressSpace The AddressSpace that contains an array of IP address ranges
-             * @return the next update stage
              */
             Update withAddressSpace(AddressSpace addressSpace);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify BgpProperties.
+         * The stage of the vpnsite {0} allowing to specify BgpProperties.
          */
         interface WithBgpProperties {
             /**
              * Specifies bgpProperties.
-             * @param bgpProperties The set of bgp properties
-             * @return the next update stage
              */
             Update withBgpProperties(BgpSettings bgpProperties);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify DeviceProperties.
+         * The stage of the vpnsite {0} allowing to specify DeviceProperties.
          */
         interface WithDeviceProperties {
             /**
              * Specifies deviceProperties.
-             * @param deviceProperties The device properties
-             * @return the next update stage
              */
             Update withDeviceProperties(DeviceProperties deviceProperties);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify IpAddress.
+         * The stage of the vpnsite {0} allowing to specify IpAddress.
          */
         interface WithIpAddress {
             /**
              * Specifies ipAddress.
-             * @param ipAddress The ip-address for the vpn-site
-             * @return the next update stage
              */
             Update withIpAddress(String ipAddress);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify ProvisioningState.
+         * The stage of the vpnsite {0} allowing to specify ProvisioningState.
          */
         interface WithProvisioningState {
             /**
              * Specifies provisioningState.
-             * @param provisioningState The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
-             * @return the next update stage
              */
             Update withProvisioningState(ProvisioningState provisioningState);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify SiteKey.
+         * The stage of the vpnsite {0} allowing to specify SiteKey.
          */
         interface WithSiteKey {
             /**
              * Specifies siteKey.
-             * @param siteKey The key for vpn-site that can be used for connections
-             * @return the next update stage
              */
             Update withSiteKey(String siteKey);
         }
 
         /**
-         * The stage of the vpnsite update allowing to specify VirtualWAN.
+         * The stage of the vpnsite {0} allowing to specify VirtualWAN.
          */
         interface WithVirtualWAN {
             /**
              * Specifies virtualWAN.
-             * @param virtualWAN The VirtualWAN to which the vpnSite belongs
-             * @return the next update stage
              */
             Update withVirtualWAN(SubResource virtualWAN);
         }
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/ConnectionMonitorsInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/ConnectionMonitorsInner.java
index c5133805d595..39dcc185e72d 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/ConnectionMonitorsInner.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/ConnectionMonitorsInner.java
@@ -10,7 +10,7 @@
 
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
-import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.network.v2018_06_01.ErrorResponseException;
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponse;
@@ -115,7 +115,7 @@ interface ConnectionMonitorsService {
      * @param connectionMonitorName The name of the connection monitor.
      * @param parameters Parameters that define the operation to create a connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectionMonitorResultInner object if successful.
      */
@@ -197,7 +197,7 @@ public Observable<ServiceResponse<ConnectionMonitorResultInner>> createOrUpdateW
      * @param connectionMonitorName The name of the connection monitor.
      * @param parameters Parameters that define the operation to create a connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectionMonitorResultInner object if successful.
      */
@@ -281,11 +281,11 @@ public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<ConnectionMonitorResultInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<ConnectionMonitorResultInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
                 .register(201, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -296,7 +296,7 @@ private ServiceResponse<ConnectionMonitorResultInner> beginCreateOrUpdateDelegat
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectionMonitorResultInner object if successful.
      */
@@ -373,10 +373,10 @@ public Observable<ServiceResponse<ConnectionMonitorResultInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<ConnectionMonitorResultInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<ConnectionMonitorResultInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<ConnectionMonitorResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -387,7 +387,7 @@ private ServiceResponse<ConnectionMonitorResultInner> getDelegate(Response<Respo
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void delete(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -460,7 +460,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginDelete(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -536,11 +536,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(202, new TypeToken<Void>() { }.getType())
                 .register(204, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -551,7 +551,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void stop(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -624,7 +624,7 @@ public Observable<ServiceResponse<Void>> stopWithServiceResponseAsync(String res
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginStop(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -700,11 +700,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<Void>() { }.getType())
                 .register(202, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -715,7 +715,7 @@ private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response)
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void start(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -788,7 +788,7 @@ public Observable<ServiceResponse<Void>> startWithServiceResponseAsync(String re
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name of the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginStart(String resourceGroupName, String networkWatcherName, String connectionMonitorName) {
@@ -864,11 +864,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginStartDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginStartDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<Void>() { }.getType())
                 .register(202, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -879,7 +879,7 @@ private ServiceResponse<Void> beginStartDelegate(Response<ResponseBody> response
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name given to the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectionMonitorQueryResultInner object if successful.
      */
@@ -953,7 +953,7 @@ public Observable<ServiceResponse<ConnectionMonitorQueryResultInner>> queryWithS
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param connectionMonitorName The name given to the connection monitor.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectionMonitorQueryResultInner object if successful.
      */
@@ -1030,11 +1030,11 @@ public Observable<ServiceResponse<ConnectionMonitorQueryResultInner>> call(Respo
             });
     }
 
-    private ServiceResponse<ConnectionMonitorQueryResultInner> beginQueryDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorQueryResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<ConnectionMonitorQueryResultInner> beginQueryDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectionMonitorQueryResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<ConnectionMonitorQueryResultInner>() { }.getType())
                 .register(202, new TypeToken<ConnectionMonitorQueryResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1044,7 +1044,7 @@ private ServiceResponse<ConnectionMonitorQueryResultInner> beginQueryDelegate(Re
      * @param resourceGroupName The name of the resource group containing Network Watcher.
      * @param networkWatcherName The name of the Network Watcher resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the List&lt;ConnectionMonitorResultInner&gt; object if successful.
      */
@@ -1120,10 +1120,10 @@ public Observable<ServiceResponse<List<ConnectionMonitorResultInner>>> call(Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<ConnectionMonitorResultInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<ConnectionMonitorResultInner>, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PageImpl1<ConnectionMonitorResultInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<ConnectionMonitorResultInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl1<ConnectionMonitorResultInner>>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java
new file mode 100644
index 000000000000..086b2c0b98e0
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseImpl.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01.implementation;
+
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticResponse;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticResult;
+
+class NetworkConfigurationDiagnosticResponseImpl extends WrapperImpl<NetworkConfigurationDiagnosticResponseInner> implements NetworkConfigurationDiagnosticResponse {
+    private final NetworkManager manager;
+    NetworkConfigurationDiagnosticResponseImpl(NetworkConfigurationDiagnosticResponseInner inner, NetworkManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public NetworkManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public List<NetworkConfigurationDiagnosticResult> results() {
+        return this.inner().results();
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseInner.java
new file mode 100644
index 000000000000..943542f188a3
--- /dev/null
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkConfigurationDiagnosticResponseInner.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.network.v2018_06_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticResult;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Results of network configuration diagnostic on the target resource.
+ */
+public class NetworkConfigurationDiagnosticResponseInner {
+    /**
+     * List of network configuration diagnostic results.
+     */
+    @JsonProperty(value = "results", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkConfigurationDiagnosticResult> results;
+
+    /**
+     * Get list of network configuration diagnostic results.
+     *
+     * @return the results value
+     */
+    public List<NetworkConfigurationDiagnosticResult> results() {
+        return this.results;
+    }
+
+}
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkManagementClientImpl.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkManagementClientImpl.java
index 4ca4a5f05461..75ddaa93bcd6 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkManagementClientImpl.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkManagementClientImpl.java
@@ -68,11 +68,11 @@ public NetworkManagementClientImpl withSubscriptionId(String subscriptionId) {
         return this;
     }
 
-    /** The preferred language for the response. */
+    /** Gets or sets the preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets The preferred language for the response.
+     * Gets Gets or sets the preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -81,7 +81,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets The preferred language for the response.
+     * Sets Gets or sets the preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -91,11 +91,11 @@ public NetworkManagementClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
     private int longRunningOperationRetryTimeout;
 
     /**
-     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -104,7 +104,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -114,11 +114,11 @@ public NetworkManagementClientImpl withLongRunningOperationRetryTimeout(int long
         return this;
     }
 
-    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
     private boolean generateClientRequestId;
 
     /**
-     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @return the generateClientRequestId value.
      */
@@ -127,7 +127,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -868,7 +868,7 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "NetworkManagementClient", "2018-06-01");
+        return String.format("%s (%s)", super.userAgent(), "NetworkManagementClient");
     }
 
     private void initializeService() {
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersImpl.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersImpl.java
index 9e02b34355a7..53af037b2e3c 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersImpl.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersImpl.java
@@ -31,6 +31,7 @@
 import com.microsoft.azure.management.network.v2018_06_01.ConnectivityInformation;
 import com.microsoft.azure.management.network.v2018_06_01.AzureReachabilityReport;
 import com.microsoft.azure.management.network.v2018_06_01.AvailableProvidersList;
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticResponse;
 import com.microsoft.azure.management.network.v2018_06_01.TopologyParameters;
 import com.microsoft.azure.management.network.v2018_06_01.VerificationIPFlowParameters;
 import com.microsoft.azure.management.network.v2018_06_01.NextHopParameters;
@@ -38,6 +39,7 @@
 import com.microsoft.azure.management.network.v2018_06_01.ConnectivityParameters;
 import com.microsoft.azure.management.network.v2018_06_01.AzureReachabilityReportParameters;
 import com.microsoft.azure.management.network.v2018_06_01.AvailableProvidersListParameters;
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticParameters;
 
 class NetworkWatchersImpl extends GroupableResourcesCoreImpl<NetworkWatcher, NetworkWatcherImpl, NetworkWatcherInner, NetworkWatchersInner, NetworkManager>  implements NetworkWatchers {
     protected NetworkWatchersImpl(NetworkManager manager) {
@@ -273,6 +275,18 @@ public AvailableProvidersList call(AvailableProvidersListInner inner) {
         });
     }
 
+    @Override
+    public Observable<NetworkConfigurationDiagnosticResponse> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        NetworkWatchersInner client = this.inner();
+        return client.getNetworkConfigurationDiagnosticAsync(resourceGroupName, networkWatcherName, parameters)
+        .map(new Func1<NetworkConfigurationDiagnosticResponseInner, NetworkConfigurationDiagnosticResponse>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponse call(NetworkConfigurationDiagnosticResponseInner inner) {
+                return new NetworkConfigurationDiagnosticResponseImpl(inner, manager());
+            }
+        });
+    }
+
     @Override
     protected NetworkWatcherImpl wrapModel(NetworkWatcherInner inner) {
         return  new NetworkWatcherImpl(inner.name(), inner, manager());
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersInner.java
index 55944e5794da..17ff5136b449 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersInner.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/NetworkWatchersInner.java
@@ -13,11 +13,12 @@
 import com.microsoft.azure.arm.collection.InnerSupportsListing;
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
-import com.microsoft.azure.CloudException;
 import com.microsoft.azure.management.network.v2018_06_01.AvailableProvidersListParameters;
 import com.microsoft.azure.management.network.v2018_06_01.AzureReachabilityReportParameters;
 import com.microsoft.azure.management.network.v2018_06_01.ConnectivityParameters;
+import com.microsoft.azure.management.network.v2018_06_01.ErrorResponseException;
 import com.microsoft.azure.management.network.v2018_06_01.FlowLogStatusParameters;
+import com.microsoft.azure.management.network.v2018_06_01.NetworkConfigurationDiagnosticParameters;
 import com.microsoft.azure.management.network.v2018_06_01.NextHopParameters;
 import com.microsoft.azure.management.network.v2018_06_01.QueryTroubleshootingParameters;
 import com.microsoft.azure.management.network.v2018_06_01.SecurityGroupViewParameters;
@@ -187,6 +188,14 @@ interface NetworkWatchersService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/availableProvidersList")
         Observable<Response<ResponseBody>> beginListAvailableProviders(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body AvailableProvidersListParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.NetworkWatchers getNetworkConfigurationDiagnostic" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/networkConfigurationDiagnostic")
+        Observable<Response<ResponseBody>> getNetworkConfigurationDiagnostic(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NetworkConfigurationDiagnosticParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.NetworkWatchers beginGetNetworkConfigurationDiagnostic" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/networkConfigurationDiagnostic")
+        Observable<Response<ResponseBody>> beginGetNetworkConfigurationDiagnostic(@Path("resourceGroupName") String resourceGroupName, @Path("networkWatcherName") String networkWatcherName, @Path("subscriptionId") String subscriptionId, @Body NetworkConfigurationDiagnosticParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -196,7 +205,7 @@ interface NetworkWatchersService {
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the network watcher resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NetworkWatcherInner object if successful.
      */
@@ -274,11 +283,11 @@ public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<NetworkWatcherInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<NetworkWatcherInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
                 .register(201, new TypeToken<NetworkWatcherInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -288,7 +297,7 @@ private ServiceResponse<NetworkWatcherInner> createOrUpdateDelegate(Response<Res
      * @param resourceGroupName The name of the resource group.
      * @param networkWatcherName The name of the network watcher.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NetworkWatcherInner object if successful.
      */
@@ -359,10 +368,10 @@ public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<NetworkWatcherInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<NetworkWatcherInner> getByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -372,7 +381,7 @@ private ServiceResponse<NetworkWatcherInner> getByResourceGroupDelegate(Response
      * @param resourceGroupName The name of the resource group.
      * @param networkWatcherName The name of the network watcher.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void delete(String resourceGroupName, String networkWatcherName) {
@@ -438,7 +447,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
      * @param resourceGroupName The name of the resource group.
      * @param networkWatcherName The name of the network watcher.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginDelete(String resourceGroupName, String networkWatcherName) {
@@ -508,11 +517,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(202, new TypeToken<Void>() { }.getType())
                 .register(204, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -522,7 +531,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
      * @param resourceGroupName The name of the resource group.
      * @param networkWatcherName The name of the network watcher.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NetworkWatcherInner object if successful.
      */
@@ -603,7 +612,7 @@ public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBo
      * @param networkWatcherName The name of the network watcher.
      * @param tags Resource tags.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NetworkWatcherInner object if successful.
      */
@@ -680,10 +689,10 @@ public Observable<ServiceResponse<NetworkWatcherInner>> call(Response<ResponseBo
             });
     }
 
-    private ServiceResponse<NetworkWatcherInner> updateTagsDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<NetworkWatcherInner> updateTagsDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkWatcherInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<NetworkWatcherInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -766,10 +775,10 @@ public Observable<ServiceResponse<List<NetworkWatcherInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl1<NetworkWatcherInner>>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -845,10 +854,10 @@ public Observable<ServiceResponse<List<NetworkWatcherInner>>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PageImpl1<NetworkWatcherInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<NetworkWatcherInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl1<NetworkWatcherInner>>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -859,7 +868,7 @@ private ServiceResponse<PageImpl1<NetworkWatcherInner>> listDelegate(Response<Re
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the representation of topology.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the TopologyInner object if successful.
      */
@@ -937,10 +946,10 @@ public Observable<ServiceResponse<TopologyInner>> call(Response<ResponseBody> re
             });
     }
 
-    private ServiceResponse<TopologyInner> getTopologyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<TopologyInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<TopologyInner> getTopologyDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TopologyInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<TopologyInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -951,7 +960,7 @@ private ServiceResponse<TopologyInner> getTopologyDelegate(Response<ResponseBody
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the IP flow to be verified.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the VerificationIPFlowResultInner object if successful.
      */
@@ -1026,7 +1035,7 @@ public Observable<ServiceResponse<VerificationIPFlowResultInner>> verifyIPFlowWi
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the IP flow to be verified.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the VerificationIPFlowResultInner object if successful.
      */
@@ -1104,11 +1113,11 @@ public Observable<ServiceResponse<VerificationIPFlowResultInner>> call(Response<
             });
     }
 
-    private ServiceResponse<VerificationIPFlowResultInner> beginVerifyIPFlowDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<VerificationIPFlowResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<VerificationIPFlowResultInner> beginVerifyIPFlowDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<VerificationIPFlowResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<VerificationIPFlowResultInner>() { }.getType())
                 .register(202, new TypeToken<VerificationIPFlowResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1119,7 +1128,7 @@ private ServiceResponse<VerificationIPFlowResultInner> beginVerifyIPFlowDelegate
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the source and destination endpoint.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NextHopResultInner object if successful.
      */
@@ -1194,7 +1203,7 @@ public Observable<ServiceResponse<NextHopResultInner>> getNextHopWithServiceResp
      * @param networkWatcherName The name of the network watcher.
      * @param parameters Parameters that define the source and destination endpoint.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the NextHopResultInner object if successful.
      */
@@ -1272,11 +1281,11 @@ public Observable<ServiceResponse<NextHopResultInner>> call(Response<ResponseBod
             });
     }
 
-    private ServiceResponse<NextHopResultInner> beginGetNextHopDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<NextHopResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<NextHopResultInner> beginGetNextHopDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NextHopResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<NextHopResultInner>() { }.getType())
                 .register(202, new TypeToken<NextHopResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1287,7 +1296,7 @@ private ServiceResponse<NextHopResultInner> beginGetNextHopDelegate(Response<Res
      * @param networkWatcherName The name of the network watcher.
      * @param targetResourceId ID of the target VM.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SecurityGroupViewResultInner object if successful.
      */
@@ -1363,7 +1372,7 @@ public Observable<ServiceResponse<SecurityGroupViewResultInner>> getVMSecurityRu
      * @param networkWatcherName The name of the network watcher.
      * @param targetResourceId ID of the target VM.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SecurityGroupViewResultInner object if successful.
      */
@@ -1442,11 +1451,11 @@ public Observable<ServiceResponse<SecurityGroupViewResultInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<SecurityGroupViewResultInner> beginGetVMSecurityRulesDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<SecurityGroupViewResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<SecurityGroupViewResultInner> beginGetVMSecurityRulesDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SecurityGroupViewResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SecurityGroupViewResultInner>() { }.getType())
                 .register(202, new TypeToken<SecurityGroupViewResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1457,7 +1466,7 @@ private ServiceResponse<SecurityGroupViewResultInner> beginGetVMSecurityRulesDel
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that define the resource to troubleshoot.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the TroubleshootingResultInner object if successful.
      */
@@ -1532,7 +1541,7 @@ public Observable<ServiceResponse<TroubleshootingResultInner>> getTroubleshootin
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that define the resource to troubleshoot.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the TroubleshootingResultInner object if successful.
      */
@@ -1610,11 +1619,11 @@ public Observable<ServiceResponse<TroubleshootingResultInner>> call(Response<Res
             });
     }
 
-    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<TroubleshootingResultInner>() { }.getType())
                 .register(202, new TypeToken<TroubleshootingResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1625,7 +1634,7 @@ private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingDeleg
      * @param networkWatcherName The name of the network watcher resource.
      * @param targetResourceId The target resource ID to query the troubleshooting result.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the TroubleshootingResultInner object if successful.
      */
@@ -1701,7 +1710,7 @@ public Observable<ServiceResponse<TroubleshootingResultInner>> getTroubleshootin
      * @param networkWatcherName The name of the network watcher resource.
      * @param targetResourceId The target resource ID to query the troubleshooting result.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the TroubleshootingResultInner object if successful.
      */
@@ -1780,11 +1789,11 @@ public Observable<ServiceResponse<TroubleshootingResultInner>> call(Response<Res
             });
     }
 
-    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingResultDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingResultDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<TroubleshootingResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<TroubleshootingResultInner>() { }.getType())
                 .register(202, new TypeToken<TroubleshootingResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1795,7 +1804,7 @@ private ServiceResponse<TroubleshootingResultInner> beginGetTroubleshootingResul
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that define the configuration of flow log.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the FlowLogInformationInner object if successful.
      */
@@ -1870,7 +1879,7 @@ public Observable<ServiceResponse<FlowLogInformationInner>> setFlowLogConfigurat
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that define the configuration of flow log.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the FlowLogInformationInner object if successful.
      */
@@ -1948,11 +1957,11 @@ public Observable<ServiceResponse<FlowLogInformationInner>> call(Response<Respon
             });
     }
 
-    private ServiceResponse<FlowLogInformationInner> beginSetFlowLogConfigurationDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<FlowLogInformationInner> beginSetFlowLogConfigurationDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<FlowLogInformationInner>() { }.getType())
                 .register(202, new TypeToken<FlowLogInformationInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -1963,7 +1972,7 @@ private ServiceResponse<FlowLogInformationInner> beginSetFlowLogConfigurationDel
      * @param networkWatcherName The name of the network watcher resource.
      * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the FlowLogInformationInner object if successful.
      */
@@ -2039,7 +2048,7 @@ public Observable<ServiceResponse<FlowLogInformationInner>> getFlowLogStatusWith
      * @param networkWatcherName The name of the network watcher resource.
      * @param targetResourceId The target resource where getting the flow log and traffic analytics (optional) status.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the FlowLogInformationInner object if successful.
      */
@@ -2118,11 +2127,11 @@ public Observable<ServiceResponse<FlowLogInformationInner>> call(Response<Respon
             });
     }
 
-    private ServiceResponse<FlowLogInformationInner> beginGetFlowLogStatusDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<FlowLogInformationInner> beginGetFlowLogStatusDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<FlowLogInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<FlowLogInformationInner>() { }.getType())
                 .register(202, new TypeToken<FlowLogInformationInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -2133,7 +2142,7 @@ private ServiceResponse<FlowLogInformationInner> beginGetFlowLogStatusDelegate(R
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that determine how the connectivity check will be performed.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectivityInformationInner object if successful.
      */
@@ -2208,7 +2217,7 @@ public Observable<ServiceResponse<ConnectivityInformationInner>> checkConnectivi
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that determine how the connectivity check will be performed.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the ConnectivityInformationInner object if successful.
      */
@@ -2286,11 +2295,11 @@ public Observable<ServiceResponse<ConnectivityInformationInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<ConnectivityInformationInner> beginCheckConnectivityDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<ConnectivityInformationInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<ConnectivityInformationInner> beginCheckConnectivityDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ConnectivityInformationInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<ConnectivityInformationInner>() { }.getType())
                 .register(202, new TypeToken<ConnectivityInformationInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -2301,7 +2310,7 @@ private ServiceResponse<ConnectivityInformationInner> beginCheckConnectivityDele
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that determine Azure reachability report configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the AzureReachabilityReportInner object if successful.
      */
@@ -2376,7 +2385,7 @@ public Observable<ServiceResponse<AzureReachabilityReportInner>> getAzureReachab
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that determine Azure reachability report configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the AzureReachabilityReportInner object if successful.
      */
@@ -2454,11 +2463,11 @@ public Observable<ServiceResponse<AzureReachabilityReportInner>> call(Response<R
             });
     }
 
-    private ServiceResponse<AzureReachabilityReportInner> beginGetAzureReachabilityReportDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<AzureReachabilityReportInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<AzureReachabilityReportInner> beginGetAzureReachabilityReportDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AzureReachabilityReportInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<AzureReachabilityReportInner>() { }.getType())
                 .register(202, new TypeToken<AzureReachabilityReportInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -2469,7 +2478,7 @@ private ServiceResponse<AzureReachabilityReportInner> beginGetAzureReachabilityR
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that scope the list of available providers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the AvailableProvidersListInner object if successful.
      */
@@ -2544,7 +2553,7 @@ public Observable<ServiceResponse<AvailableProvidersListInner>> listAvailablePro
      * @param networkWatcherName The name of the network watcher resource.
      * @param parameters Parameters that scope the list of available providers.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the AvailableProvidersListInner object if successful.
      */
@@ -2622,11 +2631,179 @@ public Observable<ServiceResponse<AvailableProvidersListInner>> call(Response<Re
             });
     }
 
-    private ServiceResponse<AvailableProvidersListInner> beginListAvailableProvidersDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<AvailableProvidersListInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<AvailableProvidersListInner> beginListAvailableProvidersDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AvailableProvidersListInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<AvailableProvidersListInner>() { }.getType())
                 .register(202, new TypeToken<AvailableProvidersListInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NetworkConfigurationDiagnosticResponseInner object if successful.
+     */
+    public NetworkConfigurationDiagnosticResponseInner getNetworkConfigurationDiagnostic(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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<NetworkConfigurationDiagnosticResponseInner> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters, final ServiceCallback<NetworkConfigurationDiagnosticResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<NetworkConfigurationDiagnosticResponseInner> getNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return getNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>, NetworkConfigurationDiagnosticResponseInner>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponseInner call(ServiceResponse<NetworkConfigurationDiagnosticResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> getNetworkConfigurationDiagnosticWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2018-06-01";
+        Observable<Response<ResponseBody>> observable = service.getNetworkConfigurationDiagnostic(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType());
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the NetworkConfigurationDiagnosticResponseInner object if successful.
+     */
+    public NetworkConfigurationDiagnosticResponseInner beginGetNetworkConfigurationDiagnostic(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @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<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters, final ServiceCallback<NetworkConfigurationDiagnosticResponseInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters), serviceCallback);
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkConfigurationDiagnosticResponseInner object
+     */
+    public Observable<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        return beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(resourceGroupName, networkWatcherName, parameters).map(new Func1<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>, NetworkConfigurationDiagnosticResponseInner>() {
+            @Override
+            public NetworkConfigurationDiagnosticResponseInner call(ServiceResponse<NetworkConfigurationDiagnosticResponseInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Get network configuration diagnostic.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param networkWatcherName The name of the network watcher.
+     * @param parameters Parameters to get network configuration diagnostic.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the NetworkConfigurationDiagnosticResponseInner object
+     */
+    public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> beginGetNetworkConfigurationDiagnosticWithServiceResponseAsync(String resourceGroupName, String networkWatcherName, NetworkConfigurationDiagnosticParameters parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (networkWatcherName == null) {
+            throw new IllegalArgumentException("Parameter networkWatcherName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String apiVersion = "2018-06-01";
+        return service.beginGetNetworkConfigurationDiagnostic(resourceGroupName, networkWatcherName, this.client.subscriptionId(), parameters, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>>>() {
+                @Override
+                public Observable<ServiceResponse<NetworkConfigurationDiagnosticResponseInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<NetworkConfigurationDiagnosticResponseInner> clientResponse = beginGetNetworkConfigurationDiagnosticDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<NetworkConfigurationDiagnosticResponseInner> beginGetNetworkConfigurationDiagnosticDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<NetworkConfigurationDiagnosticResponseInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType())
+                .register(202, new TypeToken<NetworkConfigurationDiagnosticResponseInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/PacketCapturesInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/PacketCapturesInner.java
index 4f02bd28df55..230bc3fbf256 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/PacketCapturesInner.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/PacketCapturesInner.java
@@ -10,7 +10,7 @@
 
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
-import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.network.v2018_06_01.ErrorResponseException;
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponse;
@@ -107,7 +107,7 @@ interface PacketCapturesService {
      * @param packetCaptureName The name of the packet capture session.
      * @param parameters Parameters that define the create packet capture operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PacketCaptureResultInner object if successful.
      */
@@ -189,7 +189,7 @@ public Observable<ServiceResponse<PacketCaptureResultInner>> createWithServiceRe
      * @param packetCaptureName The name of the packet capture session.
      * @param parameters Parameters that define the create packet capture operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PacketCaptureResultInner object if successful.
      */
@@ -273,10 +273,10 @@ public Observable<ServiceResponse<PacketCaptureResultInner>> call(Response<Respo
             });
     }
 
-    private ServiceResponse<PacketCaptureResultInner> beginCreateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PacketCaptureResultInner> beginCreateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(201, new TypeToken<PacketCaptureResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -287,7 +287,7 @@ private ServiceResponse<PacketCaptureResultInner> beginCreateDelegate(Response<R
      * @param networkWatcherName The name of the network watcher.
      * @param packetCaptureName The name of the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PacketCaptureResultInner object if successful.
      */
@@ -364,10 +364,10 @@ public Observable<ServiceResponse<PacketCaptureResultInner>> call(Response<Respo
             });
     }
 
-    private ServiceResponse<PacketCaptureResultInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PacketCaptureResultInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PacketCaptureResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -378,7 +378,7 @@ private ServiceResponse<PacketCaptureResultInner> getDelegate(Response<ResponseB
      * @param networkWatcherName The name of the network watcher.
      * @param packetCaptureName The name of the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void delete(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
@@ -451,7 +451,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
      * @param networkWatcherName The name of the network watcher.
      * @param packetCaptureName The name of the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginDelete(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
@@ -527,11 +527,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(202, new TypeToken<Void>() { }.getType())
                 .register(204, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -542,7 +542,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
      * @param networkWatcherName The name of the network watcher.
      * @param packetCaptureName The name of the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void stop(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
@@ -615,7 +615,7 @@ public Observable<ServiceResponse<Void>> stopWithServiceResponseAsync(String res
      * @param networkWatcherName The name of the network watcher.
      * @param packetCaptureName The name of the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      */
     public void beginStop(String resourceGroupName, String networkWatcherName, String packetCaptureName) {
@@ -691,11 +691,11 @@ public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
             });
     }
 
-    private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<Void>() { }.getType())
                 .register(202, new TypeToken<Void>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -706,7 +706,7 @@ private ServiceResponse<Void> beginStopDelegate(Response<ResponseBody> response)
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param packetCaptureName The name given to the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PacketCaptureQueryStatusResultInner object if successful.
      */
@@ -780,7 +780,7 @@ public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> getStatu
      * @param networkWatcherName The name of the Network Watcher resource.
      * @param packetCaptureName The name given to the packet capture session.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the PacketCaptureQueryStatusResultInner object if successful.
      */
@@ -857,11 +857,11 @@ public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> call(Res
             });
     }
 
-    private ServiceResponse<PacketCaptureQueryStatusResultInner> beginGetStatusDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PacketCaptureQueryStatusResultInner, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PacketCaptureQueryStatusResultInner> beginGetStatusDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PacketCaptureQueryStatusResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType())
                 .register(202, new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
@@ -871,7 +871,7 @@ private ServiceResponse<PacketCaptureQueryStatusResultInner> beginGetStatusDeleg
      * @param resourceGroupName The name of the resource group.
      * @param networkWatcherName The name of the Network Watcher resource.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @throws CloudException thrown if the request is rejected by server
+     * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the List&lt;PacketCaptureResultInner&gt; object if successful.
      */
@@ -947,10 +947,10 @@ public Observable<ServiceResponse<List<PacketCaptureResultInner>>> call(Response
             });
     }
 
-    private ServiceResponse<PageImpl1<PacketCaptureResultInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PageImpl1<PacketCaptureResultInner>, CloudException>newInstance(this.client.serializerAdapter())
+    private ServiceResponse<PageImpl1<PacketCaptureResultInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PacketCaptureResultInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<PageImpl1<PacketCaptureResultInner>>() { }.getType())
-                .registerError(CloudException.class)
+                .registerError(ErrorResponseException.class)
                 .build(response);
     }
 
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysImpl.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysImpl.java
index 605cbe0c8669..9b8004a7480f 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysImpl.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysImpl.java
@@ -119,6 +119,12 @@ public VirtualNetworkGateway call(VirtualNetworkGatewayInner inner) {
         });
     }
 
+    @Override
+    public Completable resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        VirtualNetworkGatewaysInner client = this.inner();
+        return client.resetVpnClientSharedKeyAsync(resourceGroupName, virtualNetworkGatewayName).toCompletable();
+    }
+
     @Override
     public Completable generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
         VirtualNetworkGatewaysInner client = this.inner();
diff --git a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysInner.java b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysInner.java
index bdc1fc7f4891..ed60768343ff 100644
--- a/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysInner.java
+++ b/network/resource-manager/v2018_06_01/src/main/java/com/microsoft/azure/management/network/v2018_06_01/implementation/VirtualNetworkGatewaysInner.java
@@ -113,6 +113,14 @@ interface VirtualNetworkGatewaysService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/reset")
         Observable<Response<ResponseBody>> beginReset(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("gatewayVip") String gatewayVip, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.VirtualNetworkGateways resetVpnClientSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/resetvpnclientsharedkey")
+        Observable<Response<ResponseBody>> resetVpnClientSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.VirtualNetworkGateways beginResetVpnClientSharedKey" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/resetvpnclientsharedkey")
+        Observable<Response<ResponseBody>> beginResetVpnClientSharedKey(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.network.v2018_06_01.VirtualNetworkGateways generatevpnclientpackage" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/generatevpnclientpackage")
         Observable<Response<ResponseBody>> generatevpnclientpackage(@Path("resourceGroupName") String resourceGroupName, @Path("virtualNetworkGatewayName") String virtualNetworkGatewayName, @Path("subscriptionId") String subscriptionId, @Body VpnClientParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -1451,6 +1459,156 @@ private ServiceResponse<VirtualNetworkGatewayInner> beginResetDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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
+     */
+    public void resetVpnClientSharedKey(String resourceGroupName, String virtualNetworkGatewayName) {
+        resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().last().body();
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<Void> resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> resetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return resetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> resetVpnClientSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-06-01";
+        Observable<Response<ResponseBody>> observable = service.resetVpnClientSharedKey(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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
+     */
+    public void beginResetVpnClientSharedKey(String resourceGroupName, String virtualNetworkGatewayName) {
+        beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).toBlocking().single().body();
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @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<Void> beginResetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName), serviceCallback);
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginResetVpnClientSharedKeyAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        return beginResetVpnClientSharedKeyWithServiceResponseAsync(resourceGroupName, virtualNetworkGatewayName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Resets the VPN client shared key of the virtual network gateway in the specified resource group.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginResetVpnClientSharedKeyWithServiceResponseAsync(String resourceGroupName, String virtualNetworkGatewayName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (virtualNetworkGatewayName == null) {
+            throw new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        final String apiVersion = "2018-06-01";
+        return service.beginResetVpnClientSharedKey(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginResetVpnClientSharedKeyDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginResetVpnClientSharedKeyDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Generates VPN client package for P2S client of the virtual network gateway in the specified resource group.
      *
diff --git a/policy/resource-manager/v2016_12_01/pom.xml b/policy/resource-manager/v2016_12_01/pom.xml
index 0da79d26cf73..6fa7fe70c5ab 100644
--- a/policy/resource-manager/v2016_12_01/pom.xml
+++ b/policy/resource-manager/v2016_12_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.policy.v2016_12_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-policy</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Authorization Management</name>
-    <description>This package contains Microsoft Authorization Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.policy.v2016_12_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-policy</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Authorization Management</name>
+    <description>This package contains Microsoft Authorization Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/policy/resource-manager/v2018_03_01/pom.xml b/policy/resource-manager/v2018_03_01/pom.xml
index 3d5cc7859460..2d9e372fa4f3 100644
--- a/policy/resource-manager/v2018_03_01/pom.xml
+++ b/policy/resource-manager/v2018_03_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.policy.v2018_03_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-policy</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Authorization Management</name>
-    <description>This package contains Microsoft Authorization Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.policy.v2018_03_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-policy</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Authorization Management</name>
+    <description>This package contains Microsoft Authorization Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/policy/resource-manager/v2018_05_01/pom.xml b/policy/resource-manager/v2018_05_01/pom.xml
new file mode 100644
index 000000000000..ac521b9aa371
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/pom.xml
@@ -0,0 +1,133 @@
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.policy.v2018_05_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-policy</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Authorization Management</name>
+    <description>This package contains Microsoft Authorization Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponse.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponse.java
new file mode 100644
index 000000000000..58f71f7af9fa
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponse.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Error reponse indicates Azure Resource Manager is not able to process the
+ * incoming request. The reason is provided in the error message.
+ */
+public class ErrorResponse {
+    /**
+     * Http status code.
+     */
+    @JsonProperty(value = "httpStatus")
+    private String httpStatus;
+
+    /**
+     * Error code.
+     */
+    @JsonProperty(value = "errorCode")
+    private String errorCode;
+
+    /**
+     * Error message indicating why the operation failed.
+     */
+    @JsonProperty(value = "errorMessage")
+    private String errorMessage;
+
+    /**
+     * Get http status code.
+     *
+     * @return the httpStatus value
+     */
+    public String httpStatus() {
+        return this.httpStatus;
+    }
+
+    /**
+     * Set http status code.
+     *
+     * @param httpStatus the httpStatus value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withHttpStatus(String httpStatus) {
+        this.httpStatus = httpStatus;
+        return this;
+    }
+
+    /**
+     * Get error code.
+     *
+     * @return the errorCode value
+     */
+    public String errorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * Set error code.
+     *
+     * @param errorCode the errorCode value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+        return this;
+    }
+
+    /**
+     * Get error message indicating why the operation failed.
+     *
+     * @return the errorMessage value
+     */
+    public String errorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * Set error message indicating why the operation failed.
+     *
+     * @param errorMessage the errorMessage value to set
+     * @return the ErrorResponse object itself.
+     */
+    public ErrorResponse withErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponseException.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponseException.java
new file mode 100644
index 000000000000..3776457c06b1
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ErrorResponseException.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.rest.RestException;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with ErrorResponse information.
+ */
+public class ErrorResponseException extends RestException {
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response) {
+        super(message, response);
+    }
+
+    /**
+     * Initializes a new instance of the ErrorResponseException class.
+     *
+     * @param message the exception message or the response content if a message is not available
+     * @param response the HTTP response
+     * @param body the deserialized response body
+     */
+    public ErrorResponseException(final String message, final Response<ResponseBody> response, final ErrorResponse body) {
+        super(message, response, body);
+    }
+
+    @Override
+    public ErrorResponse body() {
+        return (ErrorResponse) super.body();
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/Identity.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/Identity.java
new file mode 100644
index 000000000000..216acc1e31b5
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/Identity.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Identity for the resource.
+ */
+public class Identity {
+    /**
+     * The principal ID of the resource identity.
+     */
+    @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
+    private String principalId;
+
+    /**
+     * The tenant ID of the resource identity.
+     */
+    @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
+    private String tenantId;
+
+    /**
+     * The identity type. Possible values include: 'SystemAssigned', 'None'.
+     */
+    @JsonProperty(value = "type")
+    private ResourceIdentityType type;
+
+    /**
+     * Get the principal ID of the resource identity.
+     *
+     * @return the principalId value
+     */
+    public String principalId() {
+        return this.principalId;
+    }
+
+    /**
+     * Get the tenant ID of the resource identity.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Get the identity type. Possible values include: 'SystemAssigned', 'None'.
+     *
+     * @return the type value
+     */
+    public ResourceIdentityType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the identity type. Possible values include: 'SystemAssigned', 'None'.
+     *
+     * @param type the type value to set
+     * @return the Identity object itself.
+     */
+    public Identity withType(ResourceIdentityType type) {
+        this.type = type;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignment.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignment.java
new file mode 100644
index 000000000000..2c149820c3b0
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignment.java
@@ -0,0 +1,336 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyAssignmentInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyManager;
+import java.util.List;
+
+/**
+ * Type representing PolicyAssignment.
+ */
+public interface PolicyAssignment extends HasInner<PolicyAssignmentInner>, Indexable, Updatable<PolicyAssignment.Update>, Refreshable<PolicyAssignment>, HasManager<PolicyManager> {
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the displayName value.
+     */
+    String displayName();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the identity value.
+     */
+    Identity identity();
+
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the metadata value.
+     */
+    Object metadata();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the notScopes value.
+     */
+    List<String> notScopes();
+
+    /**
+     * @return the parameters value.
+     */
+    Object parameters();
+
+    /**
+     * @return the policyDefinitionId value.
+     */
+    String policyDefinitionId();
+
+    /**
+     * @return the scopeProperty value.
+     */
+    String scopeProperty();
+
+    /**
+     * @return the sku value.
+     */
+    PolicySku sku();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the PolicyAssignment definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithScope, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PolicyAssignment definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PolicyAssignment definition.
+         */
+        interface Blank extends WithScope {
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Scope.
+         */
+        interface WithScope {
+           /**
+            * Specifies scope.
+            */
+            WithCreate withScope(String scope);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            WithCreate withDescription(String description);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            WithCreate withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             */
+            WithCreate withIdentity(Identity identity);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            WithCreate withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify NotScopes.
+         */
+        interface WithNotScopes {
+            /**
+             * Specifies notScopes.
+             */
+            WithCreate withNotScopes(List<String> notScopes);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            WithCreate withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify PolicyDefinitionId.
+         */
+        interface WithPolicyDefinitionId {
+            /**
+             * Specifies policyDefinitionId.
+             */
+            WithCreate withPolicyDefinitionId(String policyDefinitionId);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify ScopeProperty.
+         */
+        interface WithScopeProperty {
+            /**
+             * Specifies scopeProperty.
+             */
+            WithCreate withScopeProperty(String scopeProperty);
+        }
+
+        /**
+         * The stage of the policyassignment definition allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            WithCreate withSku(PolicySku sku);
+        }
+
+        /**
+         * 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<PolicyAssignment>, DefinitionStages.WithDescription, DefinitionStages.WithDisplayName, DefinitionStages.WithIdentity, DefinitionStages.WithLocation, DefinitionStages.WithMetadata, DefinitionStages.WithNotScopes, DefinitionStages.WithParameters, DefinitionStages.WithPolicyDefinitionId, DefinitionStages.WithScopeProperty, DefinitionStages.WithSku {
+        }
+    }
+    /**
+     * The template for a PolicyAssignment update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PolicyAssignment>, UpdateStages.WithDescription, UpdateStages.WithDisplayName, UpdateStages.WithIdentity, UpdateStages.WithLocation, UpdateStages.WithMetadata, UpdateStages.WithNotScopes, UpdateStages.WithParameters, UpdateStages.WithPolicyDefinitionId, UpdateStages.WithScopeProperty, UpdateStages.WithSku {
+    }
+
+    /**
+     * Grouping of PolicyAssignment update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the policyassignment update allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            Update withDescription(String description);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            Update withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify Identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies identity.
+             */
+            Update withIdentity(Identity identity);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify Location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies location.
+             */
+            Update withLocation(String location);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            Update withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify NotScopes.
+         */
+        interface WithNotScopes {
+            /**
+             * Specifies notScopes.
+             */
+            Update withNotScopes(List<String> notScopes);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            Update withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify PolicyDefinitionId.
+         */
+        interface WithPolicyDefinitionId {
+            /**
+             * Specifies policyDefinitionId.
+             */
+            Update withPolicyDefinitionId(String policyDefinitionId);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify ScopeProperty.
+         */
+        interface WithScopeProperty {
+            /**
+             * Specifies scopeProperty.
+             */
+            Update withScopeProperty(String scopeProperty);
+        }
+
+        /**
+         * The stage of the policyassignment update allowing to specify Sku.
+         */
+        interface WithSku {
+            /**
+             * Specifies sku.
+             */
+            Update withSku(PolicySku sku);
+        }
+
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignments.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignments.java
new file mode 100644
index 000000000000..f36db547c483
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyAssignments.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyAssignmentInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyAssignmentsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PolicyAssignments.
+ */
+public interface PolicyAssignments extends SupportsCreating<PolicyAssignment.DefinitionStages.Blank>, SupportsListingByResourceGroup<PolicyAssignment>, SupportsListing<PolicyAssignment>, HasInner<PolicyAssignmentsInner> {
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes a policy assignment, given its name and the scope it was created in. The scope of a policy assignment is the part of its ID preceding '/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> deleteAsync(String scope, String policyAssignmentName);
+
+    /**
+     * Retrieves a policy assignment.
+     * This operation retrieves a single policy assignment, given its name and the scope it was created at.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> getAsync(String scope, String policyAssignmentName);
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName);
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes the policy with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid formats for {scope} are: '/providers/Microsoft.Management/managementGroups/{managementGroup}' (management group), '/subscriptions/{subscriptionId}' (subscription), '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' (resource group), or '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}' (resource).
+     *
+     * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> deleteByIdAsync(String policyAssignmentId);
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates the policy assignment with the given ID. Policy assignments made on a scope apply to all resources contained in that scope. For example, when you assign a policy to a resource group that policy applies to all resources in the group. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to create. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @param parameters Parameters for policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> createByIdAsync(String policyAssignmentId, PolicyAssignmentInner parameters);
+
+    /**
+     * Retrieves the policy assignment with the given ID.
+     * The operation retrieves the policy assignment with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to get. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyAssignment> getByIdAsync(String policyAssignmentId);
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinition.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinition.java
new file mode 100644
index 000000000000..844954a0a860
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinition.java
@@ -0,0 +1,250 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyDefinitionInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyManager;
+
+/**
+ * Type representing PolicyDefinition.
+ */
+public interface PolicyDefinition extends HasInner<PolicyDefinitionInner>, Indexable, Updatable<PolicyDefinition.Update>, Refreshable<PolicyDefinition>, HasManager<PolicyManager> {
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the displayName value.
+     */
+    String displayName();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the metadata value.
+     */
+    Object metadata();
+
+    /**
+     * @return the mode value.
+     */
+    PolicyMode mode();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the parameters value.
+     */
+    Object parameters();
+
+    /**
+     * @return the policyRule value.
+     */
+    Object policyRule();
+
+    /**
+     * @return the policyType value.
+     */
+    PolicyType policyType();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the PolicyDefinition definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PolicyDefinition definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PolicyDefinition definition.
+         */
+        interface Blank extends WithCreate {
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            WithCreate withDescription(String description);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            WithCreate withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            WithCreate withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify Mode.
+         */
+        interface WithMode {
+            /**
+             * Specifies mode.
+             */
+            WithCreate withMode(PolicyMode mode);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            WithCreate withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify PolicyRule.
+         */
+        interface WithPolicyRule {
+            /**
+             * Specifies policyRule.
+             */
+            WithCreate withPolicyRule(Object policyRule);
+        }
+
+        /**
+         * The stage of the policydefinition definition allowing to specify PolicyType.
+         */
+        interface WithPolicyType {
+            /**
+             * Specifies policyType.
+             */
+            WithCreate withPolicyType(PolicyType policyType);
+        }
+
+        /**
+         * 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<PolicyDefinition>, DefinitionStages.WithDescription, DefinitionStages.WithDisplayName, DefinitionStages.WithMetadata, DefinitionStages.WithMode, DefinitionStages.WithParameters, DefinitionStages.WithPolicyRule, DefinitionStages.WithPolicyType {
+        }
+    }
+    /**
+     * The template for a PolicyDefinition update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PolicyDefinition>, UpdateStages.WithDescription, UpdateStages.WithDisplayName, UpdateStages.WithMetadata, UpdateStages.WithMode, UpdateStages.WithParameters, UpdateStages.WithPolicyRule, UpdateStages.WithPolicyType {
+    }
+
+    /**
+     * Grouping of PolicyDefinition update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the policydefinition update allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            Update withDescription(String description);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            Update withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            Update withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify Mode.
+         */
+        interface WithMode {
+            /**
+             * Specifies mode.
+             */
+            Update withMode(PolicyMode mode);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            Update withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify PolicyRule.
+         */
+        interface WithPolicyRule {
+            /**
+             * Specifies policyRule.
+             */
+            Update withPolicyRule(Object policyRule);
+        }
+
+        /**
+         * The stage of the policydefinition update allowing to specify PolicyType.
+         */
+        interface WithPolicyType {
+            /**
+             * Specifies policyType.
+             */
+            Update withPolicyType(PolicyType policyType);
+        }
+
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitionReference.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitionReference.java
new file mode 100644
index 000000000000..a5d065bef3a9
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitionReference.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The policy definition reference.
+ */
+public class PolicyDefinitionReference {
+    /**
+     * The ID of the policy definition or policy set definition.
+     */
+    @JsonProperty(value = "policyDefinitionId")
+    private String policyDefinitionId;
+
+    /**
+     * Required if a parameter is used in policy rule.
+     */
+    @JsonProperty(value = "parameters")
+    private Object parameters;
+
+    /**
+     * Get the ID of the policy definition or policy set definition.
+     *
+     * @return the policyDefinitionId value
+     */
+    public String policyDefinitionId() {
+        return this.policyDefinitionId;
+    }
+
+    /**
+     * Set the ID of the policy definition or policy set definition.
+     *
+     * @param policyDefinitionId the policyDefinitionId value to set
+     * @return the PolicyDefinitionReference object itself.
+     */
+    public PolicyDefinitionReference withPolicyDefinitionId(String policyDefinitionId) {
+        this.policyDefinitionId = policyDefinitionId;
+        return this;
+    }
+
+    /**
+     * Get required if a parameter is used in policy rule.
+     *
+     * @return the parameters value
+     */
+    public Object parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set required if a parameter is used in policy rule.
+     *
+     * @param parameters the parameters value to set
+     * @return the PolicyDefinitionReference object itself.
+     */
+    public PolicyDefinitionReference withParameters(Object parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitions.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitions.java
new file mode 100644
index 000000000000..3ae14f085178
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyDefinitions.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyDefinitionInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyDefinitionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PolicyDefinitions.
+ */
+public interface PolicyDefinitions extends SupportsCreating<PolicyDefinition.DefinitionStages.Blank>, SupportsListing<PolicyDefinition>, HasInner<PolicyDefinitionsInner> {
+    /**
+     * Deletes a policy definition in a subscription.
+     * This operation deletes the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String policyDefinitionName);
+
+    /**
+     * Retrieves a policy definition in a subscription.
+     * This operation retrieves the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> getAsync(String policyDefinitionName);
+
+    /**
+     * Retrieves a built-in policy definition.
+     * This operation retrieves the built-in policy definition with the given name.
+     *
+     * @param policyDefinitionName The name of the built-in policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> getBuiltInAsync(String policyDefinitionName);
+
+    /**
+     * Creates or updates a policy definition in a management group.
+     * This operation creates or updates a policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> createOrUpdateAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters);
+
+    /**
+     * Deletes a policy definition in a management group.
+     * This operation deletes the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAtManagementGroupAsync(String policyDefinitionName, String managementGroupId);
+
+    /**
+     * Retrieve a policy definition in a management group.
+     * This operation retrieves the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> getAtManagementGroupAsync(String policyDefinitionName, String managementGroupId);
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> listByManagementGroupAsync(final String managementGroupId);
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicyDefinition> listBuiltInAsync();
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyMode.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyMode.java
new file mode 100644
index 000000000000..ae55d2ce4945
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyMode.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PolicyMode.
+ */
+public final class PolicyMode extends ExpandableStringEnum<PolicyMode> {
+    /** Static value NotSpecified for PolicyMode. */
+    public static final PolicyMode NOT_SPECIFIED = fromString("NotSpecified");
+
+    /** Static value Indexed for PolicyMode. */
+    public static final PolicyMode INDEXED = fromString("Indexed");
+
+    /** Static value All for PolicyMode. */
+    public static final PolicyMode ALL = fromString("All");
+
+    /**
+     * Creates or finds a PolicyMode from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PolicyMode
+     */
+    @JsonCreator
+    public static PolicyMode fromString(String name) {
+        return fromString(name, PolicyMode.class);
+    }
+
+    /**
+     * @return known PolicyMode values
+     */
+    public static Collection<PolicyMode> values() {
+        return values(PolicyMode.class);
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinition.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinition.java
new file mode 100644
index 000000000000..bcf11f7c51de
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinition.java
@@ -0,0 +1,216 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicySetDefinitionInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicyManager;
+import java.util.List;
+
+/**
+ * Type representing PolicySetDefinition.
+ */
+public interface PolicySetDefinition extends HasInner<PolicySetDefinitionInner>, Indexable, Updatable<PolicySetDefinition.Update>, Refreshable<PolicySetDefinition>, HasManager<PolicyManager> {
+    /**
+     * @return the description value.
+     */
+    String description();
+
+    /**
+     * @return the displayName value.
+     */
+    String displayName();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the metadata value.
+     */
+    Object metadata();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the parameters value.
+     */
+    Object parameters();
+
+    /**
+     * @return the policyDefinitions value.
+     */
+    List<PolicyDefinitionReference> policyDefinitions();
+
+    /**
+     * @return the policyType value.
+     */
+    PolicyType policyType();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the PolicySetDefinition definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithPolicyDefinitions, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of PolicySetDefinition definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a PolicySetDefinition definition.
+         */
+        interface Blank extends WithPolicyDefinitions {
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify PolicyDefinitions.
+         */
+        interface WithPolicyDefinitions {
+           /**
+            * Specifies policyDefinitions.
+            */
+            WithCreate withPolicyDefinitions(List<PolicyDefinitionReference> policyDefinitions);
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            WithCreate withDescription(String description);
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            WithCreate withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            WithCreate withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            WithCreate withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policysetdefinition definition allowing to specify PolicyType.
+         */
+        interface WithPolicyType {
+            /**
+             * Specifies policyType.
+             */
+            WithCreate withPolicyType(PolicyType policyType);
+        }
+
+        /**
+         * 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<PolicySetDefinition>, DefinitionStages.WithDescription, DefinitionStages.WithDisplayName, DefinitionStages.WithMetadata, DefinitionStages.WithParameters, DefinitionStages.WithPolicyType {
+        }
+    }
+    /**
+     * The template for a PolicySetDefinition update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<PolicySetDefinition>, UpdateStages.WithDescription, UpdateStages.WithDisplayName, UpdateStages.WithMetadata, UpdateStages.WithParameters, UpdateStages.WithPolicyType {
+    }
+
+    /**
+     * Grouping of PolicySetDefinition update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the policysetdefinition update allowing to specify Description.
+         */
+        interface WithDescription {
+            /**
+             * Specifies description.
+             */
+            Update withDescription(String description);
+        }
+
+        /**
+         * The stage of the policysetdefinition update allowing to specify DisplayName.
+         */
+        interface WithDisplayName {
+            /**
+             * Specifies displayName.
+             */
+            Update withDisplayName(String displayName);
+        }
+
+        /**
+         * The stage of the policysetdefinition update allowing to specify Metadata.
+         */
+        interface WithMetadata {
+            /**
+             * Specifies metadata.
+             */
+            Update withMetadata(Object metadata);
+        }
+
+        /**
+         * The stage of the policysetdefinition update allowing to specify Parameters.
+         */
+        interface WithParameters {
+            /**
+             * Specifies parameters.
+             */
+            Update withParameters(Object parameters);
+        }
+
+        /**
+         * The stage of the policysetdefinition update allowing to specify PolicyType.
+         */
+        interface WithPolicyType {
+            /**
+             * Specifies policyType.
+             */
+            Update withPolicyType(PolicyType policyType);
+        }
+
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinitions.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinitions.java
new file mode 100644
index 000000000000..d217d3b4ed6d
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySetDefinitions.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import com.microsoft.azure.arm.collection.SupportsListing;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicySetDefinitionInner;
+import com.microsoft.azure.management.policy.v2018_05_01.implementation.PolicySetDefinitionsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing PolicySetDefinitions.
+ */
+public interface PolicySetDefinitions extends SupportsCreating<PolicySetDefinition.DefinitionStages.Blank>, SupportsListing<PolicySetDefinition>, HasInner<PolicySetDefinitionsInner> {
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String policySetDefinitionName);
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> getAsync(String policySetDefinitionName);
+
+    /**
+     * Retrieves a built in policy set definition.
+     * This operation retrieves the built-in policy set definition with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> getBuiltInAsync(String policySetDefinitionName);
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> createOrUpdateAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters);
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId);
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> getAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId);
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> listByManagementGroupAsync(final String managementGroupId);
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<PolicySetDefinition> listBuiltInAsync();
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySku.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySku.java
new file mode 100644
index 000000000000..2deb4e814852
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicySku.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The policy sku. This property is optional, obsolete, and will be ignored.
+ */
+public class PolicySku {
+    /**
+     * The name of the policy sku. Possible values are A0 and A1.
+     */
+    @JsonProperty(value = "name", required = true)
+    private String name;
+
+    /**
+     * The policy sku tier. Possible values are Free and Standard.
+     */
+    @JsonProperty(value = "tier")
+    private String tier;
+
+    /**
+     * Get the name of the policy sku. Possible values are A0 and A1.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name of the policy sku. Possible values are A0 and A1.
+     *
+     * @param name the name value to set
+     * @return the PolicySku object itself.
+     */
+    public PolicySku withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the policy sku tier. Possible values are Free and Standard.
+     *
+     * @return the tier value
+     */
+    public String tier() {
+        return this.tier;
+    }
+
+    /**
+     * Set the policy sku tier. Possible values are Free and Standard.
+     *
+     * @param tier the tier value to set
+     * @return the PolicySku object itself.
+     */
+    public PolicySku withTier(String tier) {
+        this.tier = tier;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyType.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyType.java
new file mode 100644
index 000000000000..1e66edc8821e
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/PolicyType.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for PolicyType.
+ */
+public final class PolicyType extends ExpandableStringEnum<PolicyType> {
+    /** Static value NotSpecified for PolicyType. */
+    public static final PolicyType NOT_SPECIFIED = fromString("NotSpecified");
+
+    /** Static value BuiltIn for PolicyType. */
+    public static final PolicyType BUILT_IN = fromString("BuiltIn");
+
+    /** Static value Custom for PolicyType. */
+    public static final PolicyType CUSTOM = fromString("Custom");
+
+    /**
+     * Creates or finds a PolicyType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding PolicyType
+     */
+    @JsonCreator
+    public static PolicyType fromString(String name) {
+        return fromString(name, PolicyType.class);
+    }
+
+    /**
+     * @return known PolicyType values
+     */
+    public static Collection<PolicyType> values() {
+        return values(PolicyType.class);
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ResourceIdentityType.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ResourceIdentityType.java
new file mode 100644
index 000000000000..197ef162980c
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/ResourceIdentityType.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for ResourceIdentityType.
+ */
+public enum ResourceIdentityType {
+    /** Enum value SystemAssigned. */
+    SYSTEM_ASSIGNED("SystemAssigned"),
+
+    /** Enum value None. */
+    NONE("None");
+
+    /** The actual serialized value for a ResourceIdentityType instance. */
+    private String value;
+
+    ResourceIdentityType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a ResourceIdentityType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ResourceIdentityType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static ResourceIdentityType fromString(String value) {
+        ResourceIdentityType[] items = ResourceIdentityType.values();
+        for (ResourceIdentityType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/IdParsingUtils.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/IdParsingUtils.java
new file mode 100644
index 000000000000..f1aa3793a6d2
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/IdParsingUtils.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+import java.util.Arrays;
+import java.util.Iterator;
+
+class IdParsingUtils {
+    public static String getValueFromIdByName(String id, String name) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator<String> itr = iterable.iterator();
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (part.equalsIgnoreCase(name)) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getValueFromIdByPosition(String id, int pos) {
+        if (id == null) {
+            return null;
+        }
+        Iterable<String> iterable = Arrays.asList(id.split("/"));
+        Iterator <String> itr = iterable.iterator();
+        int index = 0;
+        while (itr.hasNext()) {
+            String part = itr.next();
+            if (part != null && part.trim() != "") {
+                if (index == pos) {
+                    if (itr.hasNext()) {
+                        return itr.next();
+                    } else {
+                        return null;
+                    }
+                }
+            }
+            index++;
+        }
+        return null;
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PageImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PageImpl.java
new file mode 100644
index 000000000000..3424f793e010
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PageImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentImpl.java
new file mode 100644
index 000000000000..d4ac0cacf363
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentImpl.java
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignment;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import java.util.List;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySku;
+import com.microsoft.azure.management.policy.v2018_05_01.Identity;
+
+class PolicyAssignmentImpl extends CreatableUpdatableImpl<PolicyAssignment, PolicyAssignmentInner, PolicyAssignmentImpl> implements PolicyAssignment, PolicyAssignment.Definition, PolicyAssignment.Update {
+    private String scope;
+    private String policyAssignmentName;
+    private final PolicyManager manager;
+
+    PolicyAssignmentImpl(String name, PolicyManager manager) {
+        super(name, new PolicyAssignmentInner());
+        this.manager = manager;
+        // Set resource name
+        this.policyAssignmentName = name;
+        //
+    }
+
+    PolicyAssignmentImpl(PolicyAssignmentInner inner, PolicyManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.policyAssignmentName = inner.name();
+        // resource ancestor names
+        this.policyAssignmentName = IdParsingUtils.getValueFromIdByName(inner.id(), "policyAssignments");
+        this.scope = IdParsingUtils.getValueFromIdByPosition(inner.id(), 0);
+        //
+    }
+
+    @Override
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PolicyAssignment> createResourceAsync() {
+        PolicyAssignmentsInner client = this.manager().inner().policyAssignments();
+        return client.createAsync(this.scope, this.policyAssignmentName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PolicyAssignment> updateResourceAsync() {
+        PolicyAssignmentsInner client = this.manager().inner().policyAssignments();
+        return client.createAsync(this.scope, this.policyAssignmentName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PolicyAssignmentInner> getInnerAsync() {
+        PolicyAssignmentsInner client = this.manager().inner().policyAssignments();
+        return client.getAsync(this.scope, this.policyAssignmentName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String displayName() {
+        return this.inner().displayName();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Identity identity() {
+        return this.inner().identity();
+    }
+
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public Object metadata() {
+        return this.inner().metadata();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public List<String> notScopes() {
+        return this.inner().notScopes();
+    }
+
+    @Override
+    public Object parameters() {
+        return this.inner().parameters();
+    }
+
+    @Override
+    public String policyDefinitionId() {
+        return this.inner().policyDefinitionId();
+    }
+
+    @Override
+    public String scopeProperty() {
+        return this.inner().scopeProperty();
+    }
+
+    @Override
+    public PolicySku sku() {
+        return this.inner().sku();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public PolicyAssignmentImpl withScope(String scope) {
+        this.scope = scope;
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withDescription(String description) {
+        this.inner().withDescription(description);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withDisplayName(String displayName) {
+        this.inner().withDisplayName(displayName);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withIdentity(Identity identity) {
+        this.inner().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withLocation(String location) {
+        this.inner().withLocation(location);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withMetadata(Object metadata) {
+        this.inner().withMetadata(metadata);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withNotScopes(List<String> notScopes) {
+        this.inner().withNotScopes(notScopes);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withParameters(Object parameters) {
+        this.inner().withParameters(parameters);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withPolicyDefinitionId(String policyDefinitionId) {
+        this.inner().withPolicyDefinitionId(policyDefinitionId);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withScopeProperty(String scopeProperty) {
+        this.inner().withScopeProperty(scopeProperty);
+        return this;
+    }
+
+    @Override
+    public PolicyAssignmentImpl withSku(PolicySku sku) {
+        this.inner().withSku(sku);
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentInner.java
new file mode 100644
index 000000000000..f52dd497cf45
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentInner.java
@@ -0,0 +1,285 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import java.util.List;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySku;
+import com.microsoft.azure.management.policy.v2018_05_01.Identity;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The policy assignment.
+ */
+@JsonFlatten
+public class PolicyAssignmentInner extends ProxyResource {
+    /**
+     * The display name of the policy assignment.
+     */
+    @JsonProperty(value = "properties.displayName")
+    private String displayName;
+
+    /**
+     * The ID of the policy definition or policy set definition being assigned.
+     */
+    @JsonProperty(value = "properties.policyDefinitionId")
+    private String policyDefinitionId;
+
+    /**
+     * The scope for the policy assignment.
+     */
+    @JsonProperty(value = "properties.scope")
+    private String scopeProperty;
+
+    /**
+     * The policy's excluded scopes.
+     */
+    @JsonProperty(value = "properties.notScopes")
+    private List<String> notScopes;
+
+    /**
+     * Required if a parameter is used in policy rule.
+     */
+    @JsonProperty(value = "properties.parameters")
+    private Object parameters;
+
+    /**
+     * This message will be part of response in case of policy violation.
+     */
+    @JsonProperty(value = "properties.description")
+    private String description;
+
+    /**
+     * The policy assignment metadata.
+     */
+    @JsonProperty(value = "properties.metadata")
+    private Object metadata;
+
+    /**
+     * The policy sku. This property is optional, obsolete, and will be
+     * ignored.
+     */
+    @JsonProperty(value = "sku")
+    private PolicySku sku;
+
+    /**
+     * The location of the policy assignment. Only required when utilizing
+     * managed identity.
+     */
+    @JsonProperty(value = "location")
+    private String location;
+
+    /**
+     * The managed identity associated with the policy assignment.
+     */
+    @JsonProperty(value = "identity")
+    private Identity identity;
+
+    /**
+     * Get the display name of the policy assignment.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the policy assignment.
+     *
+     * @param displayName the displayName value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the ID of the policy definition or policy set definition being assigned.
+     *
+     * @return the policyDefinitionId value
+     */
+    public String policyDefinitionId() {
+        return this.policyDefinitionId;
+    }
+
+    /**
+     * Set the ID of the policy definition or policy set definition being assigned.
+     *
+     * @param policyDefinitionId the policyDefinitionId value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withPolicyDefinitionId(String policyDefinitionId) {
+        this.policyDefinitionId = policyDefinitionId;
+        return this;
+    }
+
+    /**
+     * Get the scope for the policy assignment.
+     *
+     * @return the scopeProperty value
+     */
+    public String scopeProperty() {
+        return this.scopeProperty;
+    }
+
+    /**
+     * Set the scope for the policy assignment.
+     *
+     * @param scopeProperty the scopeProperty value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withScopeProperty(String scopeProperty) {
+        this.scopeProperty = scopeProperty;
+        return this;
+    }
+
+    /**
+     * Get the policy's excluded scopes.
+     *
+     * @return the notScopes value
+     */
+    public List<String> notScopes() {
+        return this.notScopes;
+    }
+
+    /**
+     * Set the policy's excluded scopes.
+     *
+     * @param notScopes the notScopes value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withNotScopes(List<String> notScopes) {
+        this.notScopes = notScopes;
+        return this;
+    }
+
+    /**
+     * Get required if a parameter is used in policy rule.
+     *
+     * @return the parameters value
+     */
+    public Object parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set required if a parameter is used in policy rule.
+     *
+     * @param parameters the parameters value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withParameters(Object parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+    /**
+     * Get this message will be part of response in case of policy violation.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set this message will be part of response in case of policy violation.
+     *
+     * @param description the description value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get the policy assignment metadata.
+     *
+     * @return the metadata value
+     */
+    public Object metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Set the policy assignment metadata.
+     *
+     * @param metadata the metadata value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withMetadata(Object metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get the policy sku. This property is optional, obsolete, and will be ignored.
+     *
+     * @return the sku value
+     */
+    public PolicySku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the policy sku. This property is optional, obsolete, and will be ignored.
+     *
+     * @param sku the sku value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withSku(PolicySku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the location of the policy assignment. Only required when utilizing managed identity.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set the location of the policy assignment. Only required when utilizing managed identity.
+     *
+     * @param location the location value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the managed identity associated with the policy assignment.
+     *
+     * @return the identity value
+     */
+    public Identity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the managed identity associated with the policy assignment.
+     *
+     * @param identity the identity value to set
+     * @return the PolicyAssignmentInner object itself.
+     */
+    public PolicyAssignmentInner withIdentity(Identity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsImpl.java
new file mode 100644
index 000000000000..6477daabe945
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsImpl.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * jkl
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignment;
+import com.microsoft.azure.arm.utils.PagedListConverter;
+
+class PolicyAssignmentsImpl extends WrapperImpl<PolicyAssignmentsInner> implements PolicyAssignments {
+    private PagedListConverter<PolicyAssignmentInner, PolicyAssignment> converter;
+    private final PolicyManager manager;
+
+    PolicyAssignmentsImpl(PolicyManager manager) {
+        super(manager.inner().policyAssignments());
+        this.manager = manager;
+        this.converter = new PagedListConverter<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public Observable<PolicyAssignment> typeConvertAsync(PolicyAssignmentInner inner) {
+                return Observable.just((PolicyAssignment) wrapModel(inner));
+            }
+        };
+    }
+
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public PolicyAssignmentImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private PolicyAssignmentImpl wrapModel(PolicyAssignmentInner inner) {
+        return  new PolicyAssignmentImpl(inner, manager());
+    }
+
+    private PolicyAssignmentImpl wrapModel(String name) {
+        return new PolicyAssignmentImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<PolicyAssignment> deleteAsync(String scope, String policyAssignmentName) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.deleteAsync(scope, policyAssignmentName)
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyAssignment> getAsync(String scope, String policyAssignmentName) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.getAsync(scope, policyAssignmentName)
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyAssignment> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.listForResourceAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName)
+        .flatMapIterable(new Func1<Page<PolicyAssignmentInner>, Iterable<PolicyAssignmentInner>>() {
+            @Override
+            public Iterable<PolicyAssignmentInner> call(Page<PolicyAssignmentInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyAssignment> deleteByIdAsync(String policyAssignmentId) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.deleteByIdAsync(policyAssignmentId)
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyAssignment> createByIdAsync(String policyAssignmentId, PolicyAssignmentInner parameters) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.createByIdAsync(policyAssignmentId, parameters)
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyAssignment> getByIdAsync(String policyAssignmentId) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.getByIdAsync(policyAssignmentId)
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return new PolicyAssignmentImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PolicyAssignment> list() {
+        PolicyAssignmentsInner client = this.inner();
+        return converter.convert(client.list());
+    }
+
+    @Override
+    public Observable<PolicyAssignment> listAsync() {
+        PolicyAssignmentsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PolicyAssignmentInner>, Iterable<PolicyAssignmentInner>>() {
+            @Override
+            public Iterable<PolicyAssignmentInner> call(Page<PolicyAssignmentInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PolicyAssignment> listByResourceGroup(String resourceGroupName) {
+        PolicyAssignmentsInner client = this.inner();
+        return converter.convert(client.listByResourceGroup(resourceGroupName));
+    }
+
+    @Override
+    public Observable<PolicyAssignment> listByResourceGroupAsync(String resourceGroupName) {
+        PolicyAssignmentsInner client = this.inner();
+        return client.listByResourceGroupAsync(resourceGroupName)
+        .flatMapIterable(new Func1<Page<PolicyAssignmentInner>, Iterable<PolicyAssignmentInner>>() {
+            @Override
+            public Iterable<PolicyAssignmentInner> call(Page<PolicyAssignmentInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyAssignmentInner, PolicyAssignment>() {
+            @Override
+            public PolicyAssignment call(PolicyAssignmentInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsInner.java
new file mode 100644
index 000000000000..f7106d25d246
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyAssignmentsInner.java
@@ -0,0 +1,1748 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.arm.collection.InnerSupportsDelete;
+import com.microsoft.azure.arm.collection.InnerSupportsListing;
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.policy.v2018_05_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PolicyAssignments.
+ */
+public class PolicyAssignmentsInner implements InnerSupportsDelete<PolicyAssignmentInner>, InnerSupportsListing<PolicyAssignmentInner> {
+    /** The Retrofit service to perform REST calls. */
+    private PolicyAssignmentsService service;
+    /** The service client containing this operation class. */
+    private PolicyClientImpl client;
+
+    /**
+     * Initializes an instance of PolicyAssignmentsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PolicyAssignmentsInner(Retrofit retrofit, PolicyClientImpl client) {
+        this.service = retrofit.create(PolicyAssignmentsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PolicyAssignments to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PolicyAssignmentsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments delete" })
+        @HTTP(path = "{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path(value = "scope", encoded = true) String scope, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments create" })
+        @PUT("{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}")
+        Observable<Response<ResponseBody>> create(@Path(value = "scope", encoded = true) String scope, @Path("policyAssignmentName") String policyAssignmentName, @Body PolicyAssignmentInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments get" })
+        @GET("{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}")
+        Observable<Response<ResponseBody>> get(@Path(value = "scope", encoded = true) String scope, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments listByResourceGroup" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/policyAssignments")
+        Observable<Response<ResponseBody>> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments listForResource" })
+        @GET("subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/policyAssignments")
+        Observable<Response<ResponseBody>> listForResource(@Path("resourceGroupName") String resourceGroupName, @Path("resourceProviderNamespace") String resourceProviderNamespace, @Path(value = "parentResourcePath", encoded = true) String parentResourcePath, @Path(value = "resourceType", encoded = true) String resourceType, @Path("resourceName") String resourceName, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyAssignments")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments deleteById" })
+        @HTTP(path = "{policyAssignmentId}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteById(@Path(value = "policyAssignmentId", encoded = true) String policyAssignmentId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments createById" })
+        @PUT("{policyAssignmentId}")
+        Observable<Response<ResponseBody>> createById(@Path(value = "policyAssignmentId", encoded = true) String policyAssignmentId, @Body PolicyAssignmentInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments getById" })
+        @GET("{policyAssignmentId}")
+        Observable<Response<ResponseBody>> getById(@Path(value = "policyAssignmentId", encoded = true) String policyAssignmentId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments listByResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments listForResourceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listForResourceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes a policy assignment, given its name and the scope it was created in. The scope of a policy assignment is the part of its ID preceding '/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner delete(String scope, String policyAssignmentName) {
+        return deleteWithServiceResponseAsync(scope, policyAssignmentName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes a policy assignment, given its name and the scope it was created in. The scope of a policy assignment is the part of its ID preceding '/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to delete.
+     * @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<PolicyAssignmentInner> deleteAsync(String scope, String policyAssignmentName, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(scope, policyAssignmentName), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes a policy assignment, given its name and the scope it was created in. The scope of a policy assignment is the part of its ID preceding '/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> deleteAsync(String scope, String policyAssignmentName) {
+        return deleteWithServiceResponseAsync(scope, policyAssignmentName).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes a policy assignment, given its name and the scope it was created in. The scope of a policy assignment is the part of its ID preceding '/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> deleteWithServiceResponseAsync(String scope, String policyAssignmentName) {
+        if (scope == null) {
+            throw new IllegalArgumentException("Parameter scope is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName 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.delete(scope, policyAssignmentName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> deleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates a policy assignment with the given scope and name. Policy assignments apply to all resources contained within their scope. For example, when you assign a policy at resource group scope, that policy applies to all resources in the group.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment.
+     * @param parameters Parameters for the policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner create(String scope, String policyAssignmentName, PolicyAssignmentInner parameters) {
+        return createWithServiceResponseAsync(scope, policyAssignmentName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates a policy assignment with the given scope and name. Policy assignments apply to all resources contained within their scope. For example, when you assign a policy at resource group scope, that policy applies to all resources in the group.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment.
+     * @param parameters Parameters for the policy assignment.
+     * @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<PolicyAssignmentInner> createAsync(String scope, String policyAssignmentName, PolicyAssignmentInner parameters, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createWithServiceResponseAsync(scope, policyAssignmentName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates a policy assignment with the given scope and name. Policy assignments apply to all resources contained within their scope. For example, when you assign a policy at resource group scope, that policy applies to all resources in the group.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment.
+     * @param parameters Parameters for the policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> createAsync(String scope, String policyAssignmentName, PolicyAssignmentInner parameters) {
+        return createWithServiceResponseAsync(scope, policyAssignmentName, parameters).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates a policy assignment with the given scope and name. Policy assignments apply to all resources contained within their scope. For example, when you assign a policy at resource group scope, that policy applies to all resources in the group.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment.
+     * @param parameters Parameters for the policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> createWithServiceResponseAsync(String scope, String policyAssignmentName, PolicyAssignmentInner parameters) {
+        if (scope == null) {
+            throw new IllegalArgumentException("Parameter scope is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.create(scope, policyAssignmentName, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = createDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> createDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(201, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a policy assignment.
+     * This operation retrieves a single policy assignment, given its name and the scope it was created at.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner get(String scope, String policyAssignmentName) {
+        return getWithServiceResponseAsync(scope, policyAssignmentName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a policy assignment.
+     * This operation retrieves a single policy assignment, given its name and the scope it was created at.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to get.
+     * @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<PolicyAssignmentInner> getAsync(String scope, String policyAssignmentName, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(scope, policyAssignmentName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a policy assignment.
+     * This operation retrieves a single policy assignment, given its name and the scope it was created at.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> getAsync(String scope, String policyAssignmentName) {
+        return getWithServiceResponseAsync(scope, policyAssignmentName).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a policy assignment.
+     * This operation retrieves a single policy assignment, given its name and the scope it was created at.
+     *
+     * @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
+     * @param policyAssignmentName The name of the policy assignment to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> getWithServiceResponseAsync(String scope, String policyAssignmentName) {
+        if (scope == null) {
+            throw new IllegalArgumentException("Parameter scope is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName 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.get(scope, policyAssignmentName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listByResourceGroup(final String resourceGroupName) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @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<List<PolicyAssignmentInner>> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listByResourceGroupAsync(final String resourceGroupName) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listByResourceGroup(final String resourceGroupName, final String filter) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listByResourceGroupSinglePageAsync(resourceGroupName, filter).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @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<List<PolicyAssignmentInner>> listByResourceGroupAsync(final String resourceGroupName, final String filter, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupSinglePageAsync(resourceGroupName, filter),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listByResourceGroupAsync(final String resourceGroupName, final String filter) {
+        return listByResourceGroupWithServiceResponseAsync(resourceGroupName, filter)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param resourceGroupName The name of the resource group that contains policy assignments.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName, final String filter) {
+        return listByResourceGroupSinglePageAsync(resourceGroupName, filter)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param resourceGroupName The name of the resource group that contains policy assignments.
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupSinglePageAsync(final String resourceGroupName, final String filter) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listByResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listByResourceGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listForResource(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @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<List<PolicyAssignmentInner>> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName) {
+        return listForResourceWithServiceResponseAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceWithServiceResponseAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName) {
+        return listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceSinglePageAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (resourceProviderNamespace == null) {
+            throw new IllegalArgumentException("Parameter resourceProviderNamespace is required and cannot be null.");
+        }
+        if (parentResourcePath == null) {
+            throw new IllegalArgumentException("Parameter parentResourcePath is required and cannot be null.");
+        }
+        if (resourceType == null) {
+            throw new IllegalArgumentException("Parameter resourceType is required and cannot be null.");
+        }
+        if (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        return service.listForResource(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listForResource(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final String filter) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, filter).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @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<List<PolicyAssignmentInner>> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final String filter, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, filter),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listForResourceAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final String filter) {
+        return listForResourceWithServiceResponseAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, filter)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param resourceGroupName The name of the resource group containing the resource.
+     * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+     * @param parentResourcePath The parent resource path. Use empty string if there is none.
+     * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+     * @param resourceName The name of the resource.
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceWithServiceResponseAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final String filter) {
+        return listForResourceSinglePageAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, filter)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param resourceGroupName The name of the resource group containing the resource.
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param parentResourcePath The parent resource path. Use empty string if there is none.
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param resourceType The resource type name. For example the type name of a web app is 'sites' (from Microsoft.Web/sites).
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param resourceName The name of the resource.
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceSinglePageAsync(final String resourceGroupName, final String resourceProviderNamespace, final String parentResourcePath, final String resourceType, final String resourceName, final String filter) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (resourceProviderNamespace == null) {
+            throw new IllegalArgumentException("Parameter resourceProviderNamespace is required and cannot be null.");
+        }
+        if (parentResourcePath == null) {
+            throw new IllegalArgumentException("Parameter parentResourcePath is required and cannot be null.");
+        }
+        if (resourceType == null) {
+            throw new IllegalArgumentException("Parameter resourceType is required and cannot be null.");
+        }
+        if (resourceName == null) {
+            throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listForResource(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listForResourceDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> list() {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @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<List<PolicyAssignmentInner>> listAsync(final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        return service.list(this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> list(final String filter) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listSinglePageAsync(filter).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @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<List<PolicyAssignmentInner>> listAsync(final String filter, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(filter),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listAsync(final String filter) {
+        return listWithServiceResponseAsync(filter)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listWithServiceResponseAsync(final String filter) {
+        return listSinglePageAsync(filter)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param filter The filter to apply on the operation. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, no filtering is performed.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listSinglePageAsync(final String filter) {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes the policy with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid formats for {scope} are: '/providers/Microsoft.Management/managementGroups/{managementGroup}' (management group), '/subscriptions/{subscriptionId}' (subscription), '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' (resource group), or '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}' (resource).
+     *
+     * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner deleteById(String policyAssignmentId) {
+        return deleteByIdWithServiceResponseAsync(policyAssignmentId).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes the policy with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid formats for {scope} are: '/providers/Microsoft.Management/managementGroups/{managementGroup}' (management group), '/subscriptions/{subscriptionId}' (subscription), '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' (resource group), or '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}' (resource).
+     *
+     * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @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<PolicyAssignmentInner> deleteByIdAsync(String policyAssignmentId, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteByIdWithServiceResponseAsync(policyAssignmentId), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes the policy with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid formats for {scope} are: '/providers/Microsoft.Management/managementGroups/{managementGroup}' (management group), '/subscriptions/{subscriptionId}' (subscription), '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' (resource group), or '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}' (resource).
+     *
+     * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> deleteByIdAsync(String policyAssignmentId) {
+        return deleteByIdWithServiceResponseAsync(policyAssignmentId).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy assignment.
+     * This operation deletes the policy with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid formats for {scope} are: '/providers/Microsoft.Management/managementGroups/{managementGroup}' (management group), '/subscriptions/{subscriptionId}' (subscription), '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' (resource group), or '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}' (resource).
+     *
+     * @param policyAssignmentId The ID of the policy assignment to delete. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> deleteByIdWithServiceResponseAsync(String policyAssignmentId) {
+        if (policyAssignmentId == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentId 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.deleteById(policyAssignmentId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = deleteByIdDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> deleteByIdDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates the policy assignment with the given ID. Policy assignments made on a scope apply to all resources contained in that scope. For example, when you assign a policy to a resource group that policy applies to all resources in the group. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to create. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @param parameters Parameters for policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner createById(String policyAssignmentId, PolicyAssignmentInner parameters) {
+        return createByIdWithServiceResponseAsync(policyAssignmentId, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates the policy assignment with the given ID. Policy assignments made on a scope apply to all resources contained in that scope. For example, when you assign a policy to a resource group that policy applies to all resources in the group. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to create. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @param parameters Parameters for policy assignment.
+     * @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<PolicyAssignmentInner> createByIdAsync(String policyAssignmentId, PolicyAssignmentInner parameters, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createByIdWithServiceResponseAsync(policyAssignmentId, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates the policy assignment with the given ID. Policy assignments made on a scope apply to all resources contained in that scope. For example, when you assign a policy to a resource group that policy applies to all resources in the group. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to create. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @param parameters Parameters for policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> createByIdAsync(String policyAssignmentId, PolicyAssignmentInner parameters) {
+        return createByIdWithServiceResponseAsync(policyAssignmentId, parameters).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy assignment.
+     * This operation creates or updates the policy assignment with the given ID. Policy assignments made on a scope apply to all resources contained in that scope. For example, when you assign a policy to a resource group that policy applies to all resources in the group. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to create. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @param parameters Parameters for policy assignment.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> createByIdWithServiceResponseAsync(String policyAssignmentId, PolicyAssignmentInner parameters) {
+        if (policyAssignmentId == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentId is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createById(policyAssignmentId, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = createByIdDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> createByIdDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(201, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the policy assignment with the given ID.
+     * The operation retrieves the policy assignment with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to get. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicyAssignmentInner object if successful.
+     */
+    public PolicyAssignmentInner getById(String policyAssignmentId) {
+        return getByIdWithServiceResponseAsync(policyAssignmentId).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves the policy assignment with the given ID.
+     * The operation retrieves the policy assignment with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to get. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @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<PolicyAssignmentInner> getByIdAsync(String policyAssignmentId, final ServiceCallback<PolicyAssignmentInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getByIdWithServiceResponseAsync(policyAssignmentId), serviceCallback);
+    }
+
+    /**
+     * Retrieves the policy assignment with the given ID.
+     * The operation retrieves the policy assignment with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to get. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<PolicyAssignmentInner> getByIdAsync(String policyAssignmentId) {
+        return getByIdWithServiceResponseAsync(policyAssignmentId).map(new Func1<ServiceResponse<PolicyAssignmentInner>, PolicyAssignmentInner>() {
+            @Override
+            public PolicyAssignmentInner call(ServiceResponse<PolicyAssignmentInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves the policy assignment with the given ID.
+     * The operation retrieves the policy assignment with the given ID. Policy assignment IDs have this format: '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'.
+     *
+     * @param policyAssignmentId The ID of the policy assignment to get. Use the format '{scope}/providers/Microsoft.Authorization/policyAssignments/{policyAssignmentName}'.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyAssignmentInner object
+     */
+    public Observable<ServiceResponse<PolicyAssignmentInner>> getByIdWithServiceResponseAsync(String policyAssignmentId) {
+        if (policyAssignmentId == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentId 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.getById(policyAssignmentId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyAssignmentInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyAssignmentInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyAssignmentInner> clientResponse = getByIdDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyAssignmentInner> getByIdDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyAssignmentInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyAssignmentInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listByResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyAssignmentInner>> listByResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyAssignmentInner>> serviceFuture, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listByResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listByResourceGroupNextAsync(final String nextPageLink) {
+        return listByResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource group.
+     * This operation retrieves the list of all policy assignments associated with the given resource group in the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource group, including those that apply directly or apply from containing scopes, as well as any applied to resources contained within the resource group. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource group, which is everything in the unfiltered list except those applied to resources contained within the resource group. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource group and assign the policy definition whose id is {value}.
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listByResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listByResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listByResourceGroupNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listForResourceNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listForResourceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyAssignmentInner>> listForResourceNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyAssignmentInner>> serviceFuture, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listForResourceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listForResourceNextAsync(final String nextPageLink) {
+        return listForResourceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listForResourceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a resource.
+     * This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listForResourceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listForResourceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listForResourceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listForResourceNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object if successful.
+     */
+    public PagedList<PolicyAssignmentInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyAssignmentInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyAssignmentInner>(response.body()) {
+            @Override
+            public Page<PolicyAssignmentInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyAssignmentInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyAssignmentInner>> serviceFuture, final ListOperationCallback<PolicyAssignmentInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<Page<PolicyAssignmentInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Page<PolicyAssignmentInner>>() {
+                @Override
+                public Page<PolicyAssignmentInner> call(ServiceResponse<Page<PolicyAssignmentInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyAssignmentInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyAssignmentInner>>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(ServiceResponse<Page<PolicyAssignmentInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy assignments that apply to a subscription.
+     * This operation retrieves the list of all policy assignments associated with the given subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the subscription, including those that apply directly or from management groups that contain the given subscription, as well as any applied to objects contained within the subscription. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the subscription, which is everything in the unfiltered list except those applied to objects contained within the subscription. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the subscription and assign the policy definition whose id is {value}.
+     *
+    ServiceResponse<PageImpl<PolicyAssignmentInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyAssignmentInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyAssignmentInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyAssignmentInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyAssignmentInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyAssignmentInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyAssignmentInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyAssignmentInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyAssignmentInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyClientImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyClientImpl.java
new file mode 100644
index 000000000000..cf9a60f78719
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyClientImpl.java
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the PolicyClientImpl class.
+ */
+public class PolicyClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** The ID of the target subscription. */
+    private String subscriptionId;
+
+    /**
+     * Gets The ID of the target subscription.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets The ID of the target subscription.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public PolicyClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** The API version to use for the operation. */
+    private String apiVersion;
+
+    /**
+     * Gets The API version to use for the operation.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** Gets or sets the preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets Gets or sets the preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets Gets or sets the preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public PolicyClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public PolicyClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public PolicyClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The PolicyAssignmentsInner object to access its operations.
+     */
+    private PolicyAssignmentsInner policyAssignments;
+
+    /**
+     * Gets the PolicyAssignmentsInner object to access its operations.
+     * @return the PolicyAssignmentsInner object.
+     */
+    public PolicyAssignmentsInner policyAssignments() {
+        return this.policyAssignments;
+    }
+
+    /**
+     * The PolicyDefinitionsInner object to access its operations.
+     */
+    private PolicyDefinitionsInner policyDefinitions;
+
+    /**
+     * Gets the PolicyDefinitionsInner object to access its operations.
+     * @return the PolicyDefinitionsInner object.
+     */
+    public PolicyDefinitionsInner policyDefinitions() {
+        return this.policyDefinitions;
+    }
+
+    /**
+     * The PolicySetDefinitionsInner object to access its operations.
+     */
+    private PolicySetDefinitionsInner policySetDefinitions;
+
+    /**
+     * Gets the PolicySetDefinitionsInner object to access its operations.
+     * @return the PolicySetDefinitionsInner object.
+     */
+    public PolicySetDefinitionsInner policySetDefinitions() {
+        return this.policySetDefinitions;
+    }
+
+    /**
+     * Initializes an instance of PolicyClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public PolicyClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of PolicyClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public PolicyClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of PolicyClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public PolicyClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2018-05-01";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.policyAssignments = new PolicyAssignmentsInner(restClient().retrofit(), this);
+        this.policyDefinitions = new PolicyDefinitionsInner(restClient().retrofit(), this);
+        this.policySetDefinitions = new PolicySetDefinitionsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s)", super.userAgent(), "PolicyClient", "2018-05-01");
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionImpl.java
new file mode 100644
index 000000000000..40d144a893c0
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionImpl.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinition;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyType;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyMode;
+
+class PolicyDefinitionImpl extends CreatableUpdatableImpl<PolicyDefinition, PolicyDefinitionInner, PolicyDefinitionImpl> implements PolicyDefinition, PolicyDefinition.Definition, PolicyDefinition.Update {
+    private String policyDefinitionName;
+    private final PolicyManager manager;
+
+    PolicyDefinitionImpl(String name, PolicyManager manager) {
+        super(name, new PolicyDefinitionInner());
+        this.manager = manager;
+        // Set resource name
+        this.policyDefinitionName = name;
+        //
+    }
+
+    PolicyDefinitionImpl(PolicyDefinitionInner inner, PolicyManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.policyDefinitionName = inner.name();
+        // resource ancestor names
+        this.policyDefinitionName = IdParsingUtils.getValueFromIdByName(inner.id(), "policyDefinitions");
+        //
+    }
+
+    @Override
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PolicyDefinition> createResourceAsync() {
+        PolicyDefinitionsInner client = this.manager().inner().policyDefinitions();
+        return client.createOrUpdateAsync(this.policyDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PolicyDefinition> updateResourceAsync() {
+        PolicyDefinitionsInner client = this.manager().inner().policyDefinitions();
+        return client.createOrUpdateAsync(this.policyDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PolicyDefinitionInner> getInnerAsync() {
+        PolicyDefinitionsInner client = this.manager().inner().policyDefinitions();
+        return client.getAsync(this.policyDefinitionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String displayName() {
+        return this.inner().displayName();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Object metadata() {
+        return this.inner().metadata();
+    }
+
+    @Override
+    public PolicyMode mode() {
+        return this.inner().mode();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Object parameters() {
+        return this.inner().parameters();
+    }
+
+    @Override
+    public Object policyRule() {
+        return this.inner().policyRule();
+    }
+
+    @Override
+    public PolicyType policyType() {
+        return this.inner().policyType();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public PolicyDefinitionImpl withDescription(String description) {
+        this.inner().withDescription(description);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withDisplayName(String displayName) {
+        this.inner().withDisplayName(displayName);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withMetadata(Object metadata) {
+        this.inner().withMetadata(metadata);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withMode(PolicyMode mode) {
+        this.inner().withMode(mode);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withParameters(Object parameters) {
+        this.inner().withParameters(parameters);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withPolicyRule(Object policyRule) {
+        this.inner().withPolicyRule(policyRule);
+        return this;
+    }
+
+    @Override
+    public PolicyDefinitionImpl withPolicyType(PolicyType policyType) {
+        this.inner().withPolicyType(policyType);
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionInner.java
new file mode 100644
index 000000000000..48a1f69bef9f
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionInner.java
@@ -0,0 +1,207 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyType;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyMode;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The policy definition.
+ */
+@JsonFlatten
+public class PolicyDefinitionInner extends ProxyResource {
+    /**
+     * The type of policy definition. Possible values are NotSpecified,
+     * BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn',
+     * 'Custom'.
+     */
+    @JsonProperty(value = "properties.policyType")
+    private PolicyType policyType;
+
+    /**
+     * The policy definition mode. Possible values are NotSpecified, Indexed,
+     * and All. Possible values include: 'NotSpecified', 'Indexed', 'All'.
+     */
+    @JsonProperty(value = "properties.mode")
+    private PolicyMode mode;
+
+    /**
+     * The display name of the policy definition.
+     */
+    @JsonProperty(value = "properties.displayName")
+    private String displayName;
+
+    /**
+     * The policy definition description.
+     */
+    @JsonProperty(value = "properties.description")
+    private String description;
+
+    /**
+     * The policy rule.
+     */
+    @JsonProperty(value = "properties.policyRule")
+    private Object policyRule;
+
+    /**
+     * The policy definition metadata.
+     */
+    @JsonProperty(value = "properties.metadata")
+    private Object metadata;
+
+    /**
+     * Required if a parameter is used in policy rule.
+     */
+    @JsonProperty(value = "properties.parameters")
+    private Object parameters;
+
+    /**
+     * Get the type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'.
+     *
+     * @return the policyType value
+     */
+    public PolicyType policyType() {
+        return this.policyType;
+    }
+
+    /**
+     * Set the type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'.
+     *
+     * @param policyType the policyType value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withPolicyType(PolicyType policyType) {
+        this.policyType = policyType;
+        return this;
+    }
+
+    /**
+     * Get the policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'.
+     *
+     * @return the mode value
+     */
+    public PolicyMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'.
+     *
+     * @param mode the mode value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withMode(PolicyMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Get the display name of the policy definition.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the policy definition.
+     *
+     * @param displayName the displayName value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the policy definition description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the policy definition description.
+     *
+     * @param description the description value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get the policy rule.
+     *
+     * @return the policyRule value
+     */
+    public Object policyRule() {
+        return this.policyRule;
+    }
+
+    /**
+     * Set the policy rule.
+     *
+     * @param policyRule the policyRule value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withPolicyRule(Object policyRule) {
+        this.policyRule = policyRule;
+        return this;
+    }
+
+    /**
+     * Get the policy definition metadata.
+     *
+     * @return the metadata value
+     */
+    public Object metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Set the policy definition metadata.
+     *
+     * @param metadata the metadata value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withMetadata(Object metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get required if a parameter is used in policy rule.
+     *
+     * @return the parameters value
+     */
+    public Object parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set required if a parameter is used in policy rule.
+     *
+     * @param parameters the parameters value to set
+     * @return the PolicyDefinitionInner object itself.
+     */
+    public PolicyDefinitionInner withParameters(Object parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsImpl.java
new file mode 100644
index 000000000000..5eaf126eba6a
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsImpl.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * jkl
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import rx.Completable;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinition;
+import com.microsoft.azure.arm.utils.PagedListConverter;
+
+class PolicyDefinitionsImpl extends WrapperImpl<PolicyDefinitionsInner> implements PolicyDefinitions {
+    private PagedListConverter<PolicyDefinitionInner, PolicyDefinition> converter;
+    private final PolicyManager manager;
+
+    PolicyDefinitionsImpl(PolicyManager manager) {
+        super(manager.inner().policyDefinitions());
+        this.manager = manager;
+        this.converter = new PagedListConverter<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public Observable<PolicyDefinition> typeConvertAsync(PolicyDefinitionInner inner) {
+                return Observable.just((PolicyDefinition) wrapModel(inner));
+            }
+        };
+    }
+
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public PolicyDefinitionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private PolicyDefinitionImpl wrapModel(PolicyDefinitionInner inner) {
+        return  new PolicyDefinitionImpl(inner, manager());
+    }
+
+    private PolicyDefinitionImpl wrapModel(String name) {
+        return new PolicyDefinitionImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable deleteAsync(String policyDefinitionName) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.deleteAsync(policyDefinitionName).toCompletable();
+    }
+
+    @Override
+    public Observable<PolicyDefinition> getAsync(String policyDefinitionName) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.getAsync(policyDefinitionName)
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyDefinition> getBuiltInAsync(String policyDefinitionName) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.getBuiltInAsync(policyDefinitionName)
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyDefinition> createOrUpdateAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.createOrUpdateAtManagementGroupAsync(policyDefinitionName, managementGroupId, parameters)
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAtManagementGroupAsync(String policyDefinitionName, String managementGroupId) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.deleteAtManagementGroupAsync(policyDefinitionName, managementGroupId).toCompletable();
+    }
+
+    @Override
+    public Observable<PolicyDefinition> getAtManagementGroupAsync(String policyDefinitionName, String managementGroupId) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.getAtManagementGroupAsync(policyDefinitionName, managementGroupId)
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyDefinition> listByManagementGroupAsync(final String managementGroupId) {
+        PolicyDefinitionsInner client = this.inner();
+        return client.listByManagementGroupAsync(managementGroupId)
+        .flatMapIterable(new Func1<Page<PolicyDefinitionInner>, Iterable<PolicyDefinitionInner>>() {
+            @Override
+            public Iterable<PolicyDefinitionInner> call(Page<PolicyDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicyDefinition> listBuiltInAsync() {
+        PolicyDefinitionsInner client = this.inner();
+        return client.listBuiltInAsync()
+        .flatMapIterable(new Func1<Page<PolicyDefinitionInner>, Iterable<PolicyDefinitionInner>>() {
+            @Override
+            public Iterable<PolicyDefinitionInner> call(Page<PolicyDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return new PolicyDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PolicyDefinition> list() {
+        PolicyDefinitionsInner client = this.inner();
+        return converter.convert(client.list());
+    }
+
+    @Override
+    public Observable<PolicyDefinition> listAsync() {
+        PolicyDefinitionsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PolicyDefinitionInner>, Iterable<PolicyDefinitionInner>>() {
+            @Override
+            public Iterable<PolicyDefinitionInner> call(Page<PolicyDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyDefinitionInner, PolicyDefinition>() {
+            @Override
+            public PolicyDefinition call(PolicyDefinitionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsInner.java
new file mode 100644
index 000000000000..e6928d973605
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyDefinitionsInner.java
@@ -0,0 +1,1410 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PolicyDefinitions.
+ */
+public class PolicyDefinitionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private PolicyDefinitionsService service;
+    /** The service client containing this operation class. */
+    private PolicyClientImpl client;
+
+    /**
+     * Initializes an instance of PolicyDefinitionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PolicyDefinitionsInner(Retrofit retrofit, PolicyClientImpl client) {
+        this.service = retrofit.create(PolicyDefinitionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PolicyDefinitions to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PolicyDefinitionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("policyDefinitionName") String policyDefinitionName, @Path("subscriptionId") String subscriptionId, @Body PolicyDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("policyDefinitionName") String policyDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions get" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}")
+        Observable<Response<ResponseBody>> get(@Path("policyDefinitionName") String policyDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions getBuiltIn" })
+        @GET("providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}")
+        Observable<Response<ResponseBody>> getBuiltIn(@Path("policyDefinitionName") String policyDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions createOrUpdateAtManagementGroup" })
+        @PUT("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}")
+        Observable<Response<ResponseBody>> createOrUpdateAtManagementGroup(@Path("policyDefinitionName") String policyDefinitionName, @Path("managementGroupId") String managementGroupId, @Body PolicyDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions deleteAtManagementGroup" })
+        @HTTP(path = "providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAtManagementGroup(@Path("policyDefinitionName") String policyDefinitionName, @Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions getAtManagementGroup" })
+        @GET("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policyDefinitions/{policyDefinitionName}")
+        Observable<Response<ResponseBody>> getAtManagementGroup(@Path("policyDefinitionName") String policyDefinitionName, @Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policyDefinitions")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions listBuiltIn" })
+        @GET("providers/Microsoft.Authorization/policyDefinitions")
+        Observable<Response<ResponseBody>> listBuiltIn(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions listByManagementGroup" })
+        @GET("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policyDefinitions")
+        Observable<Response<ResponseBody>> listByManagementGroup(@Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions listBuiltInNext" })
+        @GET
+        Observable<Response<ResponseBody>> listBuiltInNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions listByManagementGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByManagementGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a policy definition in a subscription.
+     * This operation creates or updates a policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param parameters The policy definition properties.
+     * @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 PolicyDefinitionInner object if successful.
+     */
+    public PolicyDefinitionInner createOrUpdate(String policyDefinitionName, PolicyDefinitionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(policyDefinitionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy definition in a subscription.
+     * This operation creates or updates a policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param parameters The policy definition properties.
+     * @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<PolicyDefinitionInner> createOrUpdateAsync(String policyDefinitionName, PolicyDefinitionInner parameters, final ServiceCallback<PolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(policyDefinitionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy definition in a subscription.
+     * This operation creates or updates a policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param parameters The policy definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<PolicyDefinitionInner> createOrUpdateAsync(String policyDefinitionName, PolicyDefinitionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(policyDefinitionName, parameters).map(new Func1<ServiceResponse<PolicyDefinitionInner>, PolicyDefinitionInner>() {
+            @Override
+            public PolicyDefinitionInner call(ServiceResponse<PolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy definition in a subscription.
+     * This operation creates or updates a policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param parameters The policy definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicyDefinitionInner>> createOrUpdateWithServiceResponseAsync(String policyDefinitionName, PolicyDefinitionInner parameters) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(policyDefinitionName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyDefinitionInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyDefinitionInner> createOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(201, new TypeToken<PolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a policy definition in a subscription.
+     * This operation deletes the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @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
+     */
+    public void delete(String policyDefinitionName) {
+        deleteWithServiceResponseAsync(policyDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy definition in a subscription.
+     * This operation deletes the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @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<Void> deleteAsync(String policyDefinitionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(policyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy definition in a subscription.
+     * This operation deletes the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String policyDefinitionName) {
+        return deleteWithServiceResponseAsync(policyDefinitionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy definition in a subscription.
+     * This operation deletes the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String policyDefinitionName) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.delete(policyDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a policy definition in a subscription.
+     * This operation retrieves the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @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 PolicyDefinitionInner object if successful.
+     */
+    public PolicyDefinitionInner get(String policyDefinitionName) {
+        return getWithServiceResponseAsync(policyDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a policy definition in a subscription.
+     * This operation retrieves the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @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<PolicyDefinitionInner> getAsync(String policyDefinitionName, final ServiceCallback<PolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(policyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a policy definition in a subscription.
+     * This operation retrieves the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<PolicyDefinitionInner> getAsync(String policyDefinitionName) {
+        return getWithServiceResponseAsync(policyDefinitionName).map(new Func1<ServiceResponse<PolicyDefinitionInner>, PolicyDefinitionInner>() {
+            @Override
+            public PolicyDefinitionInner call(ServiceResponse<PolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a policy definition in a subscription.
+     * This operation retrieves the policy definition in the given subscription with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicyDefinitionInner>> getWithServiceResponseAsync(String policyDefinitionName) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.get(policyDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyDefinitionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyDefinitionInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a built-in policy definition.
+     * This operation retrieves the built-in policy definition with the given name.
+     *
+     * @param policyDefinitionName The name of the built-in policy definition to get.
+     * @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 PolicyDefinitionInner object if successful.
+     */
+    public PolicyDefinitionInner getBuiltIn(String policyDefinitionName) {
+        return getBuiltInWithServiceResponseAsync(policyDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a built-in policy definition.
+     * This operation retrieves the built-in policy definition with the given name.
+     *
+     * @param policyDefinitionName The name of the built-in policy definition to get.
+     * @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<PolicyDefinitionInner> getBuiltInAsync(String policyDefinitionName, final ServiceCallback<PolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBuiltInWithServiceResponseAsync(policyDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a built-in policy definition.
+     * This operation retrieves the built-in policy definition with the given name.
+     *
+     * @param policyDefinitionName The name of the built-in policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<PolicyDefinitionInner> getBuiltInAsync(String policyDefinitionName) {
+        return getBuiltInWithServiceResponseAsync(policyDefinitionName).map(new Func1<ServiceResponse<PolicyDefinitionInner>, PolicyDefinitionInner>() {
+            @Override
+            public PolicyDefinitionInner call(ServiceResponse<PolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a built-in policy definition.
+     * This operation retrieves the built-in policy definition with the given name.
+     *
+     * @param policyDefinitionName The name of the built-in policy definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicyDefinitionInner>> getBuiltInWithServiceResponseAsync(String policyDefinitionName) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName 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.getBuiltIn(policyDefinitionName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyDefinitionInner> clientResponse = getBuiltInDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyDefinitionInner> getBuiltInDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a policy definition in a management group.
+     * This operation creates or updates a policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy definition properties.
+     * @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 PolicyDefinitionInner object if successful.
+     */
+    public PolicyDefinitionInner createOrUpdateAtManagementGroup(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters) {
+        return createOrUpdateAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy definition in a management group.
+     * This operation creates or updates a policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy definition properties.
+     * @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<PolicyDefinitionInner> createOrUpdateAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters, final ServiceCallback<PolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy definition in a management group.
+     * This operation creates or updates a policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<PolicyDefinitionInner> createOrUpdateAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters) {
+        return createOrUpdateAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId, parameters).map(new Func1<ServiceResponse<PolicyDefinitionInner>, PolicyDefinitionInner>() {
+            @Override
+            public PolicyDefinitionInner call(ServiceResponse<PolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy definition in a management group.
+     * This operation creates or updates a policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicyDefinitionInner>> createOrUpdateAtManagementGroupWithServiceResponseAsync(String policyDefinitionName, String managementGroupId, PolicyDefinitionInner parameters) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateAtManagementGroup(policyDefinitionName, managementGroupId, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyDefinitionInner> clientResponse = createOrUpdateAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyDefinitionInner> createOrUpdateAtManagementGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(201, new TypeToken<PolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a policy definition in a management group.
+     * This operation deletes the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @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
+     */
+    public void deleteAtManagementGroup(String policyDefinitionName, String managementGroupId) {
+        deleteAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy definition in a management group.
+     * This operation deletes the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @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<Void> deleteAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy definition in a management group.
+     * This operation deletes the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAtManagementGroupAsync(String policyDefinitionName, String managementGroupId) {
+        return deleteAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy definition in a management group.
+     * This operation deletes the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAtManagementGroupWithServiceResponseAsync(String policyDefinitionName, String managementGroupId) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.deleteAtManagementGroup(policyDefinitionName, managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAtManagementGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve a policy definition in a management group.
+     * This operation retrieves the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @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 PolicyDefinitionInner object if successful.
+     */
+    public PolicyDefinitionInner getAtManagementGroup(String policyDefinitionName, String managementGroupId) {
+        return getAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieve a policy definition in a management group.
+     * This operation retrieves the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @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<PolicyDefinitionInner> getAtManagementGroupAsync(String policyDefinitionName, String managementGroupId, final ServiceCallback<PolicyDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId), serviceCallback);
+    }
+
+    /**
+     * Retrieve a policy definition in a management group.
+     * This operation retrieves the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<PolicyDefinitionInner> getAtManagementGroupAsync(String policyDefinitionName, String managementGroupId) {
+        return getAtManagementGroupWithServiceResponseAsync(policyDefinitionName, managementGroupId).map(new Func1<ServiceResponse<PolicyDefinitionInner>, PolicyDefinitionInner>() {
+            @Override
+            public PolicyDefinitionInner call(ServiceResponse<PolicyDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieve a policy definition in a management group.
+     * This operation retrieves the policy definition in the given management group with the given name.
+     *
+     * @param policyDefinitionName The name of the policy definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicyDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicyDefinitionInner>> getAtManagementGroupWithServiceResponseAsync(String policyDefinitionName, String managementGroupId) {
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.getAtManagementGroup(policyDefinitionName, managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicyDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicyDefinitionInner> clientResponse = getAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicyDefinitionInner> getAtManagementGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicyDefinitionInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicyDefinitionInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> list() {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @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<List<PolicyDefinitionInner>> listAsync(final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> listBuiltIn() {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listBuiltInSinglePageAsync().toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @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<List<PolicyDefinitionInner>> listBuiltInAsync(final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBuiltInSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listBuiltInNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listBuiltInAsync() {
+        return listBuiltInWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listBuiltInWithServiceResponseAsync() {
+        return listBuiltInSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBuiltInNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listBuiltInSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listBuiltIn(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listBuiltInDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listBuiltInDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> listByManagementGroup(final String managementGroupId) {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listByManagementGroupSinglePageAsync(managementGroupId).toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @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<List<PolicyDefinitionInner>> listByManagementGroupAsync(final String managementGroupId, final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByManagementGroupSinglePageAsync(managementGroupId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listByManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listByManagementGroupAsync(final String managementGroupId) {
+        return listByManagementGroupWithServiceResponseAsync(managementGroupId)
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listByManagementGroupWithServiceResponseAsync(final String managementGroupId) {
+        return listByManagementGroupSinglePageAsync(managementGroupId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+    ServiceResponse<PageImpl<PolicyDefinitionInner>> * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listByManagementGroupSinglePageAsync(final String managementGroupId) {
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.listByManagementGroup(managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listByManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listByManagementGroupDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyDefinitionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyDefinitionInner>> serviceFuture, final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves policy definitions in a subscription.
+     * This operation retrieves a list of all the policy definitions in a given subscription.
+     *
+    ServiceResponse<PageImpl<PolicyDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> listBuiltInNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyDefinitionInner>> listBuiltInNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyDefinitionInner>> serviceFuture, final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBuiltInNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listBuiltInNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listBuiltInNextAsync(final String nextPageLink) {
+        return listBuiltInNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listBuiltInNextWithServiceResponseAsync(final String nextPageLink) {
+        return listBuiltInNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBuiltInNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve built-in policy definitions.
+     * This operation retrieves a list of all the built-in policy definitions.
+     *
+    ServiceResponse<PageImpl<PolicyDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listBuiltInNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listBuiltInNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listBuiltInNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listBuiltInNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;PolicyDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicyDefinitionInner> listByManagementGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyDefinitionInner>> response = listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicyDefinitionInner> nextPage(String nextPageLink) {
+                return listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicyDefinitionInner>> listByManagementGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyDefinitionInner>> serviceFuture, final ListOperationCallback<PolicyDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByManagementGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(String nextPageLink) {
+                    return listByManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicyDefinitionInner>> listByManagementGroupNextAsync(final String nextPageLink) {
+        return listByManagementGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Page<PolicyDefinitionInner>>() {
+                @Override
+                public Page<PolicyDefinitionInner> call(ServiceResponse<Page<PolicyDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listByManagementGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByManagementGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyDefinitionInner>>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(ServiceResponse<Page<PolicyDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieve policy definitions in a management group.
+     * This operation retrieves a list of all the policy definitions in a given management group.
+     *
+    ServiceResponse<PageImpl<PolicyDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> listByManagementGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByManagementGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicyDefinitionInner>> result = listByManagementGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicyDefinitionInner>> listByManagementGroupNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicyDefinitionInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicyDefinitionInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyManager.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyManager.java
new file mode 100644
index 000000000000..470260f1770d
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicyManager.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyAssignments;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitions;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Authorization resource management.
+ */
+public final class PolicyManager extends ManagerCore<PolicyManager, PolicyClientImpl> {
+    private PolicyAssignments policyAssignments;
+    private PolicyDefinitions policyDefinitions;
+    private PolicySetDefinitions policySetDefinitions;
+    /**
+    * Get a Configurable instance that can be used to create PolicyManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new PolicyManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of PolicyManager that exposes Authorization resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the PolicyManager
+    */
+    public static PolicyManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new PolicyManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of PolicyManager that exposes Authorization resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the PolicyManager
+    */
+    public static PolicyManager authenticate(RestClient restClient, String subscriptionId) {
+        return new PolicyManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of PolicyManager that exposes Authorization management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Authorization management API entry points that work across subscriptions
+        */
+        PolicyManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage PolicyAssignments.
+     */
+    public PolicyAssignments policyAssignments() {
+        if (this.policyAssignments == null) {
+            this.policyAssignments = new PolicyAssignmentsImpl(this);
+        }
+        return this.policyAssignments;
+    }
+
+    /**
+     * @return Entry point to manage PolicyDefinitions.
+     */
+    public PolicyDefinitions policyDefinitions() {
+        if (this.policyDefinitions == null) {
+            this.policyDefinitions = new PolicyDefinitionsImpl(this);
+        }
+        return this.policyDefinitions;
+    }
+
+    /**
+     * @return Entry point to manage PolicySetDefinitions.
+     */
+    public PolicySetDefinitions policySetDefinitions() {
+        if (this.policySetDefinitions == null) {
+            this.policySetDefinitions = new PolicySetDefinitionsImpl(this);
+        }
+        return this.policySetDefinitions;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public PolicyManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return PolicyManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private PolicyManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new PolicyClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionImpl.java
new file mode 100644
index 000000000000..c36599707910
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionImpl.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinition;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyType;
+import java.util.List;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitionReference;
+
+class PolicySetDefinitionImpl extends CreatableUpdatableImpl<PolicySetDefinition, PolicySetDefinitionInner, PolicySetDefinitionImpl> implements PolicySetDefinition, PolicySetDefinition.Definition, PolicySetDefinition.Update {
+    private String policySetDefinitionName;
+    private final PolicyManager manager;
+
+    PolicySetDefinitionImpl(String name, PolicyManager manager) {
+        super(name, new PolicySetDefinitionInner());
+        this.manager = manager;
+        // Set resource name
+        this.policySetDefinitionName = name;
+        //
+    }
+
+    PolicySetDefinitionImpl(PolicySetDefinitionInner inner, PolicyManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.policySetDefinitionName = inner.name();
+        // resource ancestor names
+        this.policySetDefinitionName = IdParsingUtils.getValueFromIdByName(inner.id(), "policySetDefinitions");
+        //
+    }
+
+    @Override
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> createResourceAsync() {
+        PolicySetDefinitionsInner client = this.manager().inner().policySetDefinitions();
+        return client.createOrUpdateAsync(this.policySetDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> updateResourceAsync() {
+        PolicySetDefinitionsInner client = this.manager().inner().policySetDefinitions();
+        return client.createOrUpdateAsync(this.policySetDefinitionName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<PolicySetDefinitionInner> getInnerAsync() {
+        PolicySetDefinitionsInner client = this.manager().inner().policySetDefinitions();
+        return client.getAsync(this.policySetDefinitionName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public String description() {
+        return this.inner().description();
+    }
+
+    @Override
+    public String displayName() {
+        return this.inner().displayName();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public Object metadata() {
+        return this.inner().metadata();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public Object parameters() {
+        return this.inner().parameters();
+    }
+
+    @Override
+    public List<PolicyDefinitionReference> policyDefinitions() {
+        return this.inner().policyDefinitions();
+    }
+
+    @Override
+    public PolicyType policyType() {
+        return this.inner().policyType();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withPolicyDefinitions(List<PolicyDefinitionReference> policyDefinitions) {
+        this.inner().withPolicyDefinitions(policyDefinitions);
+        return this;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withDescription(String description) {
+        this.inner().withDescription(description);
+        return this;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withDisplayName(String displayName) {
+        this.inner().withDisplayName(displayName);
+        return this;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withMetadata(Object metadata) {
+        this.inner().withMetadata(metadata);
+        return this;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withParameters(Object parameters) {
+        this.inner().withParameters(parameters);
+        return this;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl withPolicyType(PolicyType policyType) {
+        this.inner().withPolicyType(policyType);
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionInner.java
new file mode 100644
index 000000000000..e735b4d10897
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionInner.java
@@ -0,0 +1,182 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyType;
+import java.util.List;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicyDefinitionReference;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The policy set definition.
+ */
+@JsonFlatten
+public class PolicySetDefinitionInner extends ProxyResource {
+    /**
+     * The type of policy definition. Possible values are NotSpecified,
+     * BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn',
+     * 'Custom'.
+     */
+    @JsonProperty(value = "properties.policyType")
+    private PolicyType policyType;
+
+    /**
+     * The display name of the policy set definition.
+     */
+    @JsonProperty(value = "properties.displayName")
+    private String displayName;
+
+    /**
+     * The policy set definition description.
+     */
+    @JsonProperty(value = "properties.description")
+    private String description;
+
+    /**
+     * The policy set definition metadata.
+     */
+    @JsonProperty(value = "properties.metadata")
+    private Object metadata;
+
+    /**
+     * The policy set definition parameters that can be used in policy
+     * definition references.
+     */
+    @JsonProperty(value = "properties.parameters")
+    private Object parameters;
+
+    /**
+     * An array of policy definition references.
+     */
+    @JsonProperty(value = "properties.policyDefinitions", required = true)
+    private List<PolicyDefinitionReference> policyDefinitions;
+
+    /**
+     * Get the type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'.
+     *
+     * @return the policyType value
+     */
+    public PolicyType policyType() {
+        return this.policyType;
+    }
+
+    /**
+     * Set the type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'.
+     *
+     * @param policyType the policyType value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withPolicyType(PolicyType policyType) {
+        this.policyType = policyType;
+        return this;
+    }
+
+    /**
+     * Get the display name of the policy set definition.
+     *
+     * @return the displayName value
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the display name of the policy set definition.
+     *
+     * @param displayName the displayName value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the policy set definition description.
+     *
+     * @return the description value
+     */
+    public String description() {
+        return this.description;
+    }
+
+    /**
+     * Set the policy set definition description.
+     *
+     * @param description the description value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * Get the policy set definition metadata.
+     *
+     * @return the metadata value
+     */
+    public Object metadata() {
+        return this.metadata;
+    }
+
+    /**
+     * Set the policy set definition metadata.
+     *
+     * @param metadata the metadata value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withMetadata(Object metadata) {
+        this.metadata = metadata;
+        return this;
+    }
+
+    /**
+     * Get the policy set definition parameters that can be used in policy definition references.
+     *
+     * @return the parameters value
+     */
+    public Object parameters() {
+        return this.parameters;
+    }
+
+    /**
+     * Set the policy set definition parameters that can be used in policy definition references.
+     *
+     * @param parameters the parameters value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withParameters(Object parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+    /**
+     * Get an array of policy definition references.
+     *
+     * @return the policyDefinitions value
+     */
+    public List<PolicyDefinitionReference> policyDefinitions() {
+        return this.policyDefinitions;
+    }
+
+    /**
+     * Set an array of policy definition references.
+     *
+     * @param policyDefinitions the policyDefinitions value to set
+     * @return the PolicySetDefinitionInner object itself.
+     */
+    public PolicySetDefinitionInner withPolicyDefinitions(List<PolicyDefinitionReference> policyDefinitions) {
+        this.policyDefinitions = policyDefinitions;
+        return this;
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsImpl.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsImpl.java
new file mode 100644
index 000000000000..d19444dd8056
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsImpl.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * jkl
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.PagedList;
+import com.microsoft.azure.Page;
+import rx.Completable;
+import com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinition;
+import com.microsoft.azure.arm.utils.PagedListConverter;
+
+class PolicySetDefinitionsImpl extends WrapperImpl<PolicySetDefinitionsInner> implements PolicySetDefinitions {
+    private PagedListConverter<PolicySetDefinitionInner, PolicySetDefinition> converter;
+    private final PolicyManager manager;
+
+    PolicySetDefinitionsImpl(PolicyManager manager) {
+        super(manager.inner().policySetDefinitions());
+        this.manager = manager;
+        this.converter = new PagedListConverter<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public Observable<PolicySetDefinition> typeConvertAsync(PolicySetDefinitionInner inner) {
+                return Observable.just((PolicySetDefinition) wrapModel(inner));
+            }
+        };
+    }
+
+    public PolicyManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public PolicySetDefinitionImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private PolicySetDefinitionImpl wrapModel(PolicySetDefinitionInner inner) {
+        return  new PolicySetDefinitionImpl(inner, manager());
+    }
+
+    private PolicySetDefinitionImpl wrapModel(String name) {
+        return new PolicySetDefinitionImpl(name, this.manager());
+    }
+
+    @Override
+    public Completable deleteAsync(String policySetDefinitionName) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.deleteAsync(policySetDefinitionName).toCompletable();
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> getAsync(String policySetDefinitionName) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.getAsync(policySetDefinitionName)
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> getBuiltInAsync(String policySetDefinitionName) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.getBuiltInAsync(policySetDefinitionName)
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> createOrUpdateAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.createOrUpdateAtManagementGroupAsync(policySetDefinitionName, managementGroupId, parameters)
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Completable deleteAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.deleteAtManagementGroupAsync(policySetDefinitionName, managementGroupId).toCompletable();
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> getAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.getAtManagementGroupAsync(policySetDefinitionName, managementGroupId)
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> listByManagementGroupAsync(final String managementGroupId) {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.listByManagementGroupAsync(managementGroupId)
+        .flatMapIterable(new Func1<Page<PolicySetDefinitionInner>, Iterable<PolicySetDefinitionInner>>() {
+            @Override
+            public Iterable<PolicySetDefinitionInner> call(Page<PolicySetDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> listBuiltInAsync() {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.listBuiltInAsync()
+        .flatMapIterable(new Func1<Page<PolicySetDefinitionInner>, Iterable<PolicySetDefinitionInner>>() {
+            @Override
+            public Iterable<PolicySetDefinitionInner> call(Page<PolicySetDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return new PolicySetDefinitionImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public PagedList<PolicySetDefinition> list() {
+        PolicySetDefinitionsInner client = this.inner();
+        return converter.convert(client.list());
+    }
+
+    @Override
+    public Observable<PolicySetDefinition> listAsync() {
+        PolicySetDefinitionsInner client = this.inner();
+        return client.listAsync()
+        .flatMapIterable(new Func1<Page<PolicySetDefinitionInner>, Iterable<PolicySetDefinitionInner>>() {
+            @Override
+            public Iterable<PolicySetDefinitionInner> call(Page<PolicySetDefinitionInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicySetDefinitionInner, PolicySetDefinition>() {
+            @Override
+            public PolicySetDefinition call(PolicySetDefinitionInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsInner.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsInner.java
new file mode 100644
index 000000000000..9aab871910ec
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/PolicySetDefinitionsInner.java
@@ -0,0 +1,1412 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.management.policy.v2018_05_01.ErrorResponseException;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PolicySetDefinitions.
+ */
+public class PolicySetDefinitionsInner {
+    /** The Retrofit service to perform REST calls. */
+    private PolicySetDefinitionsService service;
+    /** The service client containing this operation class. */
+    private PolicyClientImpl client;
+
+    /**
+     * Initializes an instance of PolicySetDefinitionsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PolicySetDefinitionsInner(Retrofit retrofit, PolicyClientImpl client) {
+        this.service = retrofit.create(PolicySetDefinitionsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PolicySetDefinitions to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PolicySetDefinitionsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("subscriptionId") String subscriptionId, @Body PolicySetDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions get" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}")
+        Observable<Response<ResponseBody>> get(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions getBuiltIn" })
+        @GET("providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}")
+        Observable<Response<ResponseBody>> getBuiltIn(@Path("policySetDefinitionName") String policySetDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions list" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Authorization/policySetDefinitions")
+        Observable<Response<ResponseBody>> list(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions listBuiltIn" })
+        @GET("providers/Microsoft.Authorization/policySetDefinitions")
+        Observable<Response<ResponseBody>> listBuiltIn(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions createOrUpdateAtManagementGroup" })
+        @PUT("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}")
+        Observable<Response<ResponseBody>> createOrUpdateAtManagementGroup(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("managementGroupId") String managementGroupId, @Body PolicySetDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions deleteAtManagementGroup" })
+        @HTTP(path = "providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> deleteAtManagementGroup(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions getAtManagementGroup" })
+        @GET("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policySetDefinitions/{policySetDefinitionName}")
+        Observable<Response<ResponseBody>> getAtManagementGroup(@Path("policySetDefinitionName") String policySetDefinitionName, @Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions listByManagementGroup" })
+        @GET("providers/Microsoft.Management/managementgroups/{managementGroupId}/providers/Microsoft.Authorization/policySetDefinitions")
+        Observable<Response<ResponseBody>> listByManagementGroup(@Path("managementGroupId") String managementGroupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions listNext" })
+        @GET
+        Observable<Response<ResponseBody>> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions listBuiltInNext" })
+        @GET
+        Observable<Response<ResponseBody>> listBuiltInNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policy.v2018_05_01.PolicySetDefinitions listByManagementGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByManagementGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicySetDefinitionInner object if successful.
+     */
+    public PolicySetDefinitionInner createOrUpdate(String policySetDefinitionName, PolicySetDefinitionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(policySetDefinitionName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param parameters The policy set definition properties.
+     * @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<PolicySetDefinitionInner> createOrUpdateAsync(String policySetDefinitionName, PolicySetDefinitionInner parameters, final ServiceCallback<PolicySetDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(policySetDefinitionName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<PolicySetDefinitionInner> createOrUpdateAsync(String policySetDefinitionName, PolicySetDefinitionInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(policySetDefinitionName, parameters).map(new Func1<ServiceResponse<PolicySetDefinitionInner>, PolicySetDefinitionInner>() {
+            @Override
+            public PolicySetDefinitionInner call(ServiceResponse<PolicySetDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicySetDefinitionInner>> createOrUpdateWithServiceResponseAsync(String policySetDefinitionName, PolicySetDefinitionInner parameters) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdate(policySetDefinitionName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicySetDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicySetDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicySetDefinitionInner> clientResponse = createOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicySetDefinitionInner> createOrUpdateDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicySetDefinitionInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .register(201, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void delete(String policySetDefinitionName) {
+        deleteWithServiceResponseAsync(policySetDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @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<Void> deleteAsync(String policySetDefinitionName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(policySetDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAsync(String policySetDefinitionName) {
+        return deleteWithServiceResponseAsync(policySetDefinitionName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String policySetDefinitionName) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.delete(policySetDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicySetDefinitionInner object if successful.
+     */
+    public PolicySetDefinitionInner get(String policySetDefinitionName) {
+        return getWithServiceResponseAsync(policySetDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @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<PolicySetDefinitionInner> getAsync(String policySetDefinitionName, final ServiceCallback<PolicySetDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(policySetDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<PolicySetDefinitionInner> getAsync(String policySetDefinitionName) {
+        return getWithServiceResponseAsync(policySetDefinitionName).map(new Func1<ServiceResponse<PolicySetDefinitionInner>, PolicySetDefinitionInner>() {
+            @Override
+            public PolicySetDefinitionInner call(ServiceResponse<PolicySetDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given subscription with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicySetDefinitionInner>> getWithServiceResponseAsync(String policySetDefinitionName) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.get(policySetDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicySetDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicySetDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicySetDefinitionInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicySetDefinitionInner> getDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicySetDefinitionInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a built in policy set definition.
+     * This operation retrieves the built-in policy set definition with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicySetDefinitionInner object if successful.
+     */
+    public PolicySetDefinitionInner getBuiltIn(String policySetDefinitionName) {
+        return getBuiltInWithServiceResponseAsync(policySetDefinitionName).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a built in policy set definition.
+     * This operation retrieves the built-in policy set definition with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @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<PolicySetDefinitionInner> getBuiltInAsync(String policySetDefinitionName, final ServiceCallback<PolicySetDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getBuiltInWithServiceResponseAsync(policySetDefinitionName), serviceCallback);
+    }
+
+    /**
+     * Retrieves a built in policy set definition.
+     * This operation retrieves the built-in policy set definition with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<PolicySetDefinitionInner> getBuiltInAsync(String policySetDefinitionName) {
+        return getBuiltInWithServiceResponseAsync(policySetDefinitionName).map(new Func1<ServiceResponse<PolicySetDefinitionInner>, PolicySetDefinitionInner>() {
+            @Override
+            public PolicySetDefinitionInner call(ServiceResponse<PolicySetDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a built in policy set definition.
+     * This operation retrieves the built-in policy set definition with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicySetDefinitionInner>> getBuiltInWithServiceResponseAsync(String policySetDefinitionName) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName 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.getBuiltIn(policySetDefinitionName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicySetDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicySetDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicySetDefinitionInner> clientResponse = getBuiltInDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicySetDefinitionInner> getBuiltInDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicySetDefinitionInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> list() {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listSinglePageAsync().toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @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<List<PolicySetDefinitionInner>> listAsync(final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listAsync() {
+        return listWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listWithServiceResponseAsync() {
+        return listSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listSinglePageAsync() {
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> listBuiltIn() {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listBuiltInSinglePageAsync().toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @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<List<PolicySetDefinitionInner>> listBuiltInAsync(final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBuiltInSinglePageAsync(),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listBuiltInNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listBuiltInAsync() {
+        return listBuiltInWithServiceResponseAsync()
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listBuiltInWithServiceResponseAsync() {
+        return listBuiltInSinglePageAsync()
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBuiltInNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listBuiltInSinglePageAsync() {
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        return service.listBuiltIn(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listBuiltInDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listBuiltInDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicySetDefinitionInner object if successful.
+     */
+    public PolicySetDefinitionInner createOrUpdateAtManagementGroup(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters) {
+        return createOrUpdateAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy set definition properties.
+     * @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<PolicySetDefinitionInner> createOrUpdateAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters, final ServiceCallback<PolicySetDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<PolicySetDefinitionInner> createOrUpdateAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters) {
+        return createOrUpdateAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId, parameters).map(new Func1<ServiceResponse<PolicySetDefinitionInner>, PolicySetDefinitionInner>() {
+            @Override
+            public PolicySetDefinitionInner call(ServiceResponse<PolicySetDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a policy set definition.
+     * This operation creates or updates a policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to create.
+     * @param managementGroupId The ID of the management group.
+     * @param parameters The policy set definition properties.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicySetDefinitionInner>> createOrUpdateAtManagementGroupWithServiceResponseAsync(String policySetDefinitionName, String managementGroupId, PolicySetDefinitionInner parameters) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.createOrUpdateAtManagementGroup(policySetDefinitionName, managementGroupId, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicySetDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicySetDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicySetDefinitionInner> clientResponse = createOrUpdateAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicySetDefinitionInner> createOrUpdateAtManagementGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicySetDefinitionInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .register(201, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     */
+    public void deleteAtManagementGroup(String policySetDefinitionName, String managementGroupId) {
+        deleteAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @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<Void> deleteAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId), serviceCallback);
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> deleteAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId) {
+        return deleteAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes a policy set definition.
+     * This operation deletes the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to delete.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> deleteAtManagementGroupWithServiceResponseAsync(String policySetDefinitionName, String managementGroupId) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.deleteAtManagementGroup(policySetDefinitionName, managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = deleteAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> deleteAtManagementGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PolicySetDefinitionInner object if successful.
+     */
+    public PolicySetDefinitionInner getAtManagementGroup(String policySetDefinitionName, String managementGroupId) {
+        return getAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId).toBlocking().single().body();
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @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<PolicySetDefinitionInner> getAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId, final ServiceCallback<PolicySetDefinitionInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId), serviceCallback);
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<PolicySetDefinitionInner> getAtManagementGroupAsync(String policySetDefinitionName, String managementGroupId) {
+        return getAtManagementGroupWithServiceResponseAsync(policySetDefinitionName, managementGroupId).map(new Func1<ServiceResponse<PolicySetDefinitionInner>, PolicySetDefinitionInner>() {
+            @Override
+            public PolicySetDefinitionInner call(ServiceResponse<PolicySetDefinitionInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Retrieves a policy set definition.
+     * This operation retrieves the policy set definition in the given management group with the given name.
+     *
+     * @param policySetDefinitionName The name of the policy set definition to get.
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PolicySetDefinitionInner object
+     */
+    public Observable<ServiceResponse<PolicySetDefinitionInner>> getAtManagementGroupWithServiceResponseAsync(String policySetDefinitionName, String managementGroupId) {
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        }
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.getAtManagementGroup(policySetDefinitionName, managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicySetDefinitionInner>>>() {
+                @Override
+                public Observable<ServiceResponse<PolicySetDefinitionInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PolicySetDefinitionInner> clientResponse = getAtManagementGroupDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PolicySetDefinitionInner> getAtManagementGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PolicySetDefinitionInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PolicySetDefinitionInner>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> listByManagementGroup(final String managementGroupId) {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listByManagementGroupSinglePageAsync(managementGroupId).toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @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<List<PolicySetDefinitionInner>> listByManagementGroupAsync(final String managementGroupId, final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByManagementGroupSinglePageAsync(managementGroupId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listByManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listByManagementGroupAsync(final String managementGroupId) {
+        return listByManagementGroupWithServiceResponseAsync(managementGroupId)
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listByManagementGroupWithServiceResponseAsync(final String managementGroupId) {
+        return listByManagementGroupSinglePageAsync(managementGroupId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+    ServiceResponse<PageImpl<PolicySetDefinitionInner>> * @param managementGroupId The ID of the management group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listByManagementGroupSinglePageAsync(final String managementGroupId) {
+        if (managementGroupId == null) {
+            throw new IllegalArgumentException("Parameter managementGroupId 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.listByManagementGroup(managementGroupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listByManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listByManagementGroupDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> listNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicySetDefinitionInner>> listNextAsync(final String nextPageLink, final ServiceFuture<List<PolicySetDefinitionInner>> serviceFuture, final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listNextAsync(final String nextPageLink) {
+        return listNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listNextWithServiceResponseAsync(final String nextPageLink) {
+        return listNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves the policy set definitions for a subscription.
+     * This operation retrieves a list of all the policy set definitions in the given subscription.
+     *
+    ServiceResponse<PageImpl<PolicySetDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> listBuiltInNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listBuiltInNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicySetDefinitionInner>> listBuiltInNextAsync(final String nextPageLink, final ServiceFuture<List<PolicySetDefinitionInner>> serviceFuture, final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listBuiltInNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listBuiltInNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listBuiltInNextAsync(final String nextPageLink) {
+        return listBuiltInNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listBuiltInNextWithServiceResponseAsync(final String nextPageLink) {
+        return listBuiltInNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listBuiltInNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves built-in policy set definitions.
+     * This operation retrieves a list of all the built-in policy set definitions.
+     *
+    ServiceResponse<PageImpl<PolicySetDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listBuiltInNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listBuiltInNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listBuiltInNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listBuiltInNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws ErrorResponseException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object if successful.
+     */
+    public PagedList<PolicySetDefinitionInner> listByManagementGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicySetDefinitionInner>> response = listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicySetDefinitionInner>(response.body()) {
+            @Override
+            public Page<PolicySetDefinitionInner> nextPage(String nextPageLink) {
+                return listByManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<PolicySetDefinitionInner>> listByManagementGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicySetDefinitionInner>> serviceFuture, final ListOperationCallback<PolicySetDefinitionInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByManagementGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(String nextPageLink) {
+                    return listByManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<Page<PolicySetDefinitionInner>> listByManagementGroupNextAsync(final String nextPageLink) {
+        return listByManagementGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Page<PolicySetDefinitionInner>>() {
+                @Override
+                public Page<PolicySetDefinitionInner> call(ServiceResponse<Page<PolicySetDefinitionInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicySetDefinitionInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listByManagementGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByManagementGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicySetDefinitionInner>>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(ServiceResponse<Page<PolicySetDefinitionInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Retrieves all policy set definitions in management group.
+     * This operation retrieves a list of all the a policy set definition in the given management group.
+     *
+    ServiceResponse<PageImpl<PolicySetDefinitionInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicySetDefinitionInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> listByManagementGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByManagementGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicySetDefinitionInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicySetDefinitionInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<PolicySetDefinitionInner>> result = listByManagementGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicySetDefinitionInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<PolicySetDefinitionInner>> listByManagementGroupNextDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<PolicySetDefinitionInner>, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<PolicySetDefinitionInner>>() { }.getType())
+                .registerError(ErrorResponseException.class)
+                .build(response);
+    }
+
+}
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/package-info.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/package-info.java
new file mode 100644
index 000000000000..fe917bebd5f1
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/implementation/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the implementation classes for PolicyClient.
+ * To manage and control access to your resources, you can define customized policies and assign them at a scope.
+ */
+package com.microsoft.azure.management.policy.v2018_05_01.implementation;
diff --git a/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/package-info.java b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/package-info.java
new file mode 100644
index 000000000000..637ccbe97ca9
--- /dev/null
+++ b/policy/resource-manager/v2018_05_01/src/main/java/com/microsoft/azure/management/policy/v2018_05_01/package-info.java
@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * This package contains the classes for PolicyClient.
+ * To manage and control access to your resources, you can define customized policies and assign them at a scope.
+ */
+package com.microsoft.azure.management.policy.v2018_05_01;
diff --git a/resources/resource-manager/v2016_06_01/pom.xml b/resources/resource-manager/v2016_06_01/pom.xml
index 5dede5d47543..b16009df8b60 100644
--- a/resources/resource-manager/v2016_06_01/pom.xml
+++ b/resources/resource-manager/v2016_06_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.resources.v2016_06_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for  Management</name>
-    <description>This package contains Microsoft  Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.resources.v2016_06_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for  Management</name>
+    <description>This package contains Microsoft  Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/resources/resource-manager/v2016_09_01/pom.xml b/resources/resource-manager/v2016_09_01/pom.xml
index ad20e2296282..8d6fd5208ec9 100644
--- a/resources/resource-manager/v2016_09_01/pom.xml
+++ b/resources/resource-manager/v2016_09_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.resources.v2016_09_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-resources</artifactId>
-    <version>1.0.0-beta</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Resources Management</name>
-    <description>This package contains Microsoft Resources Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.resources.v2016_09_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-resources</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Resources Management</name>
+    <description>This package contains Microsoft Resources Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/resources/resource-manager/v2018_02_01/pom.xml b/resources/resource-manager/v2018_02_01/pom.xml
index 9f8e148a9e1d..7b098662563c 100644
--- a/resources/resource-manager/v2018_02_01/pom.xml
+++ b/resources/resource-manager/v2018_02_01/pom.xml
@@ -1,133 +1,133 @@
-<!--
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.microsoft.azure.resources.v2018_02_01</groupId>
-    <parent>
-        <groupId>com.microsoft.azure</groupId>
-        <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-    <artifactId>azure-mgmt-resources</artifactId>
-    <version>1.0.0-beta-1</version>
-    <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for Resources Management</name>
-    <description>This package contains Microsoft Resources Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
-        <tag>HEAD</tag>
-    </scm>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-client-authentication</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-mgmt-resources</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-arm-client-runtime</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <annotationProcessors>
-                        <annotationProcessor>
-                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
-                        </annotationProcessor>
-                    </annotationProcessors>
-                    <debug>true</debug>
-                    <optimize>true</optimize>
-                    <compilerArguments>
-                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
-                        <Adebug>true</Adebug>
-                    </compilerArguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
-                    <bottom>
-                        <![CDATA[<code>
-                            /**
-                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
-                            <br />* Licensed under the MIT License. See License.txt in the project root for
-                            <br />* license information.
-                            <br />*/
-                        </code>]]>
-                    </bottom>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.resources.v2018_02_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>0.0.2-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-resources</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Resources Management</name>
+    <description>This package contains Microsoft Resources Management SDK.</description>
+    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
+        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/sql/resource-manager/v2014_04_01/pom.xml b/sql/resource-manager/v2014_04_01/pom.xml
index ea0859894df5..15ee9d56a144 100644
--- a/sql/resource-manager/v2014_04_01/pom.xml
+++ b/sql/resource-manager/v2014_04_01/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
+        <version>0.0.2-beta</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
diff --git a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseSecurityAlertPolicyInner.java b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseSecurityAlertPolicyInner.java
index 7a528d7a582e..1e92ff6db0b1 100644
--- a/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseSecurityAlertPolicyInner.java
+++ b/sql/resource-manager/v2014_04_01/src/main/java/com/microsoft/azure/management/sql/v2014_04_01/implementation/DatabaseSecurityAlertPolicyInner.java
@@ -43,7 +43,8 @@ public class DatabaseSecurityAlertPolicyInner extends ProxyResource {
     /**
      * Specifies the semicolon-separated list of alerts that are disabled, or
      * empty string to disable no alerts. Possible values: Sql_Injection;
-     * Sql_Injection_Vulnerability; Access_Anomaly; Usage_Anomaly.
+     * Sql_Injection_Vulnerability; Access_Anomaly; Data_Exfiltration;
+     * Unsafe_Action.
      */
     @JsonProperty(value = "properties.disabledAlerts")
     private String disabledAlerts;
@@ -141,7 +142,7 @@ public DatabaseSecurityAlertPolicyInner withState(SecurityAlertPolicyState state
     }
 
     /**
-     * Get specifies the semicolon-separated list of alerts that are disabled, or empty string to disable no alerts. Possible values: Sql_Injection; Sql_Injection_Vulnerability; Access_Anomaly; Usage_Anomaly.
+     * Get specifies the semicolon-separated list of alerts that are disabled, or empty string to disable no alerts. Possible values: Sql_Injection; Sql_Injection_Vulnerability; Access_Anomaly; Data_Exfiltration; Unsafe_Action.
      *
      * @return the disabledAlerts value
      */
@@ -150,7 +151,7 @@ public String disabledAlerts() {
     }
 
     /**
-     * Set specifies the semicolon-separated list of alerts that are disabled, or empty string to disable no alerts. Possible values: Sql_Injection; Sql_Injection_Vulnerability; Access_Anomaly; Usage_Anomaly.
+     * Set specifies the semicolon-separated list of alerts that are disabled, or empty string to disable no alerts. Possible values: Sql_Injection; Sql_Injection_Vulnerability; Access_Anomaly; Data_Exfiltration; Unsafe_Action.
      *
      * @param disabledAlerts the disabledAlerts value to set
      * @return the DatabaseSecurityAlertPolicyInner object itself.
diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml
index 6e9980f3ddc1..c8dd3d5addf7 100644
--- a/sql/resource-manager/v2017_10_01_preview/pom.xml
+++ b/sql/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
+        <version>0.0.2-beta</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtector.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtector.java
new file mode 100644
index 000000000000..6c16d10ffdc6
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtector.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.SqlManager;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceEncryptionProtectorInner;
+
+/**
+ * Type representing ManagedInstanceEncryptionProtector.
+ */
+public interface ManagedInstanceEncryptionProtector extends HasInner<ManagedInstanceEncryptionProtectorInner>, HasManager<SqlManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the serverKeyName value.
+     */
+    String serverKeyName();
+
+    /**
+     * @return the serverKeyType value.
+     */
+    ServerKeyType serverKeyType();
+
+    /**
+     * @return the thumbprint value.
+     */
+    String thumbprint();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the uri value.
+     */
+    String uri();
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java
new file mode 100644
index 000000000000..228e27215ed8
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceEncryptionProtectors.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview;
+
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceEncryptionProtectorInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceEncryptionProtectorsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ManagedInstanceEncryptionProtectors.
+ */
+public interface ManagedInstanceEncryptionProtectors extends HasInner<ManagedInstanceEncryptionProtectorsInner> {
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceEncryptionProtector> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+    /**
+     * Gets a managed instance encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceEncryptionProtector> getAsync(String resourceGroupName, String managedInstanceName);
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceEncryptionProtector> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKey.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKey.java
new file mode 100644
index 000000000000..a69ab0744afb
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKey.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceKeyInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+import com.microsoft.azure.arm.model.Appliable;
+import com.microsoft.azure.arm.model.Creatable;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.SqlManager;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing ManagedInstanceKey.
+ */
+public interface ManagedInstanceKey extends HasInner<ManagedInstanceKeyInner>, Indexable, Refreshable<ManagedInstanceKey>, Updatable<ManagedInstanceKey.Update>, HasManager<SqlManager> {
+    /**
+     * @return the creationDate value.
+     */
+    DateTime creationDate();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the kind value.
+     */
+    String kind();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the serverKeyType value.
+     */
+    ServerKeyType serverKeyType();
+
+    /**
+     * @return the thumbprint value.
+     */
+    String thumbprint();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * @return the uri value.
+     */
+    String uri();
+
+    /**
+     * The entirety of the ManagedInstanceKey definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedInstance, DefinitionStages.WithServerKeyType, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of ManagedInstanceKey definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a ManagedInstanceKey definition.
+         */
+        interface Blank extends WithManagedInstance {
+        }
+
+        /**
+         * The stage of the managedinstancekey definition allowing to specify ManagedInstance.
+         */
+        interface WithManagedInstance {
+           /**
+            * Specifies resourceGroupName, managedInstanceName.
+            */
+            WithServerKeyType withExistingManagedInstance(String resourceGroupName, String managedInstanceName);
+        }
+
+        /**
+         * The stage of the managedinstancekey definition allowing to specify ServerKeyType.
+         */
+        interface WithServerKeyType {
+           /**
+            * Specifies serverKeyType.
+            */
+            WithCreate withServerKeyType(ServerKeyType serverKeyType);
+        }
+
+        /**
+         * The stage of the managedinstancekey definition allowing to specify Uri.
+         */
+        interface WithUri {
+            /**
+             * Specifies uri.
+             */
+            WithCreate withUri(String uri);
+        }
+
+        /**
+         * 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<ManagedInstanceKey>, DefinitionStages.WithUri {
+        }
+    }
+    /**
+     * The template for a ManagedInstanceKey update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<ManagedInstanceKey>, UpdateStages.WithUri {
+    }
+
+    /**
+     * Grouping of ManagedInstanceKey update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the managedinstancekey update allowing to specify Uri.
+         */
+        interface WithUri {
+            /**
+             * Specifies uri.
+             */
+            Update withUri(String uri);
+        }
+
+    }
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKeys.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKeys.java
new file mode 100644
index 000000000000..320d0d09266e
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ManagedInstanceKeys.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview;
+
+import com.microsoft.azure.arm.collection.SupportsCreating;
+import rx.Completable;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.implementation.ManagedInstanceKeysInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ManagedInstanceKeys.
+ */
+public interface ManagedInstanceKeys extends SupportsCreating<ManagedInstanceKey.DefinitionStages.Blank>, HasInner<ManagedInstanceKeysInner> {
+    /**
+     * Gets a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceKey> getAsync(String resourceGroupName, String managedInstanceName, String keyName);
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ManagedInstanceKey> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName);
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable deleteAsync(String resourceGroupName, String managedInstanceName, String keyName);
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ServerKeyType.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ServerKeyType.java
new file mode 100644
index 000000000000..d13b712b173e
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/ServerKeyType.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ServerKeyType.
+ */
+public final class ServerKeyType extends ExpandableStringEnum<ServerKeyType> {
+    /** Static value ServiceManaged for ServerKeyType. */
+    public static final ServerKeyType SERVICE_MANAGED = fromString("ServiceManaged");
+
+    /** Static value AzureKeyVault for ServerKeyType. */
+    public static final ServerKeyType AZURE_KEY_VAULT = fromString("AzureKeyVault");
+
+    /**
+     * Creates or finds a ServerKeyType from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ServerKeyType
+     */
+    @JsonCreator
+    public static ServerKeyType fromString(String name) {
+        return fromString(name, ServerKeyType.class);
+    }
+
+    /**
+     * @return known ServerKeyType values
+     */
+    public static Collection<ServerKeyType> values() {
+        return values(ServerKeyType.class);
+    }
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorImpl.java
new file mode 100644
index 000000000000..dcfd21c06f2e
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorImpl.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtector;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ServerKeyType;
+
+class ManagedInstanceEncryptionProtectorImpl extends WrapperImpl<ManagedInstanceEncryptionProtectorInner> implements ManagedInstanceEncryptionProtector {
+    private final SqlManager manager;
+    ManagedInstanceEncryptionProtectorImpl(ManagedInstanceEncryptionProtectorInner inner, SqlManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public String serverKeyName() {
+        return this.inner().serverKeyName();
+    }
+
+    @Override
+    public ServerKeyType serverKeyType() {
+        return this.inner().serverKeyType();
+    }
+
+    @Override
+    public String thumbprint() {
+        return this.inner().thumbprint();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public String uri() {
+        return this.inner().uri();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorInner.java
new file mode 100644
index 000000000000..42b50da5e4d9
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorInner.java
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ServerKeyType;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The managed instance encryption protector.
+ */
+@JsonFlatten
+public class ManagedInstanceEncryptionProtectorInner extends ProxyResource {
+    /**
+     * Kind of encryption protector. This is metadata used for the Azure portal
+     * experience.
+     */
+    @JsonProperty(value = "kind", access = JsonProperty.Access.WRITE_ONLY)
+    private String kind;
+
+    /**
+     * The name of the managed instance key.
+     */
+    @JsonProperty(value = "properties.serverKeyName")
+    private String serverKeyName;
+
+    /**
+     * The encryption protector type like 'ServiceManaged', 'AzureKeyVault'.
+     * Possible values include: 'ServiceManaged', 'AzureKeyVault'.
+     */
+    @JsonProperty(value = "properties.serverKeyType", required = true)
+    private ServerKeyType serverKeyType;
+
+    /**
+     * The URI of the server key.
+     */
+    @JsonProperty(value = "properties.uri", access = JsonProperty.Access.WRITE_ONLY)
+    private String uri;
+
+    /**
+     * Thumbprint of the server key.
+     */
+    @JsonProperty(value = "properties.thumbprint", access = JsonProperty.Access.WRITE_ONLY)
+    private String thumbprint;
+
+    /**
+     * Get kind of encryption protector. This is metadata used for the Azure portal experience.
+     *
+     * @return the kind value
+     */
+    public String kind() {
+        return this.kind;
+    }
+
+    /**
+     * Get the name of the managed instance key.
+     *
+     * @return the serverKeyName value
+     */
+    public String serverKeyName() {
+        return this.serverKeyName;
+    }
+
+    /**
+     * Set the name of the managed instance key.
+     *
+     * @param serverKeyName the serverKeyName value to set
+     * @return the ManagedInstanceEncryptionProtectorInner object itself.
+     */
+    public ManagedInstanceEncryptionProtectorInner withServerKeyName(String serverKeyName) {
+        this.serverKeyName = serverKeyName;
+        return this;
+    }
+
+    /**
+     * Get the encryption protector type like 'ServiceManaged', 'AzureKeyVault'. Possible values include: 'ServiceManaged', 'AzureKeyVault'.
+     *
+     * @return the serverKeyType value
+     */
+    public ServerKeyType serverKeyType() {
+        return this.serverKeyType;
+    }
+
+    /**
+     * Set the encryption protector type like 'ServiceManaged', 'AzureKeyVault'. Possible values include: 'ServiceManaged', 'AzureKeyVault'.
+     *
+     * @param serverKeyType the serverKeyType value to set
+     * @return the ManagedInstanceEncryptionProtectorInner object itself.
+     */
+    public ManagedInstanceEncryptionProtectorInner withServerKeyType(ServerKeyType serverKeyType) {
+        this.serverKeyType = serverKeyType;
+        return this;
+    }
+
+    /**
+     * Get the URI of the server key.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Get thumbprint of the server key.
+     *
+     * @return the thumbprint value
+     */
+    public String thumbprint() {
+        return this.thumbprint;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java
new file mode 100644
index 000000000000..f5e79e61090b
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsImpl.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * abc
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
+import rx.functions.Func1;
+import rx.Observable;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtector;
+
+class ManagedInstanceEncryptionProtectorsImpl extends WrapperImpl<ManagedInstanceEncryptionProtectorsInner> implements ManagedInstanceEncryptionProtectors {
+    private final SqlManager manager;
+
+    ManagedInstanceEncryptionProtectorsImpl(SqlManager manager) {
+        super(manager.inner().managedInstanceEncryptionProtectors());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ManagedInstanceEncryptionProtector> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        ManagedInstanceEncryptionProtectorsInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<ManagedInstanceEncryptionProtectorInner>, Iterable<ManagedInstanceEncryptionProtectorInner>>() {
+            @Override
+            public Iterable<ManagedInstanceEncryptionProtectorInner> call(Page<ManagedInstanceEncryptionProtectorInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedInstanceEncryptionProtectorInner, ManagedInstanceEncryptionProtector>() {
+            @Override
+            public ManagedInstanceEncryptionProtector call(ManagedInstanceEncryptionProtectorInner inner) {
+                return new ManagedInstanceEncryptionProtectorImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ManagedInstanceEncryptionProtector> getAsync(String resourceGroupName, String managedInstanceName) {
+        ManagedInstanceEncryptionProtectorsInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName)
+        .map(new Func1<ManagedInstanceEncryptionProtectorInner, ManagedInstanceEncryptionProtector>() {
+            @Override
+            public ManagedInstanceEncryptionProtector call(ManagedInstanceEncryptionProtectorInner inner) {
+                return new ManagedInstanceEncryptionProtectorImpl(inner, manager());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ManagedInstanceEncryptionProtector> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        ManagedInstanceEncryptionProtectorsInner client = this.inner();
+        return client.createOrUpdateAsync(resourceGroupName, managedInstanceName, parameters)
+        .map(new Func1<ManagedInstanceEncryptionProtectorInner, ManagedInstanceEncryptionProtector>() {
+            @Override
+            public ManagedInstanceEncryptionProtector call(ManagedInstanceEncryptionProtectorInner inner) {
+                return new ManagedInstanceEncryptionProtectorImpl(inner, manager());
+            }
+        });
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java
new file mode 100644
index 000000000000..303c257a8ea7
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceEncryptionProtectorsInner.java
@@ -0,0 +1,580 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedInstanceEncryptionProtectors.
+ */
+public class ManagedInstanceEncryptionProtectorsInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedInstanceEncryptionProtectorsService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedInstanceEncryptionProtectorsInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedInstanceEncryptionProtectorsInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedInstanceEncryptionProtectorsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedInstanceEncryptionProtectors to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedInstanceEncryptionProtectorsService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector/{encryptionProtectorName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("encryptionProtectorName") String encryptionProtectorName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector/{encryptionProtectorName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("encryptionProtectorName") String encryptionProtectorName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceEncryptionProtectorInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/encryptionProtector/{encryptionProtectorName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("encryptionProtectorName") String encryptionProtectorName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceEncryptionProtectorInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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 PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceEncryptionProtectorInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<ManagedInstanceEncryptionProtectorInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceEncryptionProtectorInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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<List<ManagedInstanceEncryptionProtectorInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<ManagedInstanceEncryptionProtectorInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceEncryptionProtectorInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>, Page<ManagedInstanceEncryptionProtectorInner>>() {
+                @Override
+                public Page<ManagedInstanceEncryptionProtectorInner> call(ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceEncryptionProtectorInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceEncryptionProtectorInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a managed instance encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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 ManagedInstanceEncryptionProtectorInner object if successful.
+     */
+    public ManagedInstanceEncryptionProtectorInner get(String resourceGroupName, String managedInstanceName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a managed instance encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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<ManagedInstanceEncryptionProtectorInner> getAsync(String resourceGroupName, String managedInstanceName, final ServiceCallback<ManagedInstanceEncryptionProtectorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName), serviceCallback);
+    }
+
+    /**
+     * Gets a managed instance encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceEncryptionProtectorInner object
+     */
+    public Observable<ManagedInstanceEncryptionProtectorInner> getAsync(String resourceGroupName, String managedInstanceName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName).map(new Func1<ServiceResponse<ManagedInstanceEncryptionProtectorInner>, ManagedInstanceEncryptionProtectorInner>() {
+            @Override
+            public ManagedInstanceEncryptionProtectorInner call(ServiceResponse<ManagedInstanceEncryptionProtectorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a managed instance encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceEncryptionProtectorInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String encryptionProtectorName = "current";
+        return service.get(resourceGroupName, managedInstanceName, encryptionProtectorName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceEncryptionProtectorInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceEncryptionProtectorInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceEncryptionProtectorInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceEncryptionProtectorInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @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 ManagedInstanceEncryptionProtectorInner object if successful.
+     */
+    public ManagedInstanceEncryptionProtectorInner createOrUpdate(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @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<ManagedInstanceEncryptionProtectorInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters, final ServiceCallback<ManagedInstanceEncryptionProtectorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedInstanceEncryptionProtectorInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).map(new Func1<ServiceResponse<ManagedInstanceEncryptionProtectorInner>, ManagedInstanceEncryptionProtectorInner>() {
+            @Override
+            public ManagedInstanceEncryptionProtectorInner call(ServiceResponse<ManagedInstanceEncryptionProtectorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String encryptionProtectorName = "current";
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, encryptionProtectorName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedInstanceEncryptionProtectorInner>() { }.getType());
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @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 ManagedInstanceEncryptionProtectorInner object if successful.
+     */
+    public ManagedInstanceEncryptionProtectorInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @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<ManagedInstanceEncryptionProtectorInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters, final ServiceCallback<ManagedInstanceEncryptionProtectorInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters), serviceCallback);
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceEncryptionProtectorInner object
+     */
+    public Observable<ManagedInstanceEncryptionProtectorInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, parameters).map(new Func1<ServiceResponse<ManagedInstanceEncryptionProtectorInner>, ManagedInstanceEncryptionProtectorInner>() {
+            @Override
+            public ManagedInstanceEncryptionProtectorInner call(ServiceResponse<ManagedInstanceEncryptionProtectorInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Updates an existing encryption protector.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param parameters The requested encryption protector resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceEncryptionProtectorInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, ManagedInstanceEncryptionProtectorInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        final String encryptionProtectorName = "current";
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, encryptionProtectorName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceEncryptionProtectorInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceEncryptionProtectorInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceEncryptionProtectorInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceEncryptionProtectorInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceEncryptionProtectorInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceEncryptionProtectorInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedInstanceEncryptionProtectorInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceEncryptionProtectorInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ManagedInstanceEncryptionProtectorInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedInstanceEncryptionProtectorInner>> serviceFuture, final ListOperationCallback<ManagedInstanceEncryptionProtectorInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceEncryptionProtectorInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>, Page<ManagedInstanceEncryptionProtectorInner>>() {
+                @Override
+                public Page<ManagedInstanceEncryptionProtectorInner> call(ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance encryption protectors.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceEncryptionProtectorInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> listByInstanceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceEncryptionProtectorInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceEncryptionProtectorInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceEncryptionProtectorInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceEncryptionProtectorInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyImpl.java
new file mode 100644
index 000000000000..473b1359e9ab
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyImpl.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKey;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
+import rx.Observable;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ServerKeyType;
+import org.joda.time.DateTime;
+
+class ManagedInstanceKeyImpl extends CreatableUpdatableImpl<ManagedInstanceKey, ManagedInstanceKeyInner, ManagedInstanceKeyImpl> implements ManagedInstanceKey, ManagedInstanceKey.Definition, ManagedInstanceKey.Update {
+    private final SqlManager manager;
+    private String resourceGroupName;
+    private String managedInstanceName;
+    private String keyName;
+
+    ManagedInstanceKeyImpl(String name, SqlManager manager) {
+        super(name, new ManagedInstanceKeyInner());
+        this.manager = manager;
+        // Set resource name
+        this.keyName = name;
+        //
+    }
+
+    ManagedInstanceKeyImpl(ManagedInstanceKeyInner inner, SqlManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.keyName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.managedInstanceName = IdParsingUtils.getValueFromIdByName(inner.id(), "managedInstances");
+        this.keyName = IdParsingUtils.getValueFromIdByName(inner.id(), "keys");
+        //
+    }
+
+    @Override
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Observable<ManagedInstanceKey> createResourceAsync() {
+        ManagedInstanceKeysInner client = this.manager().inner().managedInstanceKeys();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.keyName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    public Observable<ManagedInstanceKey> updateResourceAsync() {
+        ManagedInstanceKeysInner client = this.manager().inner().managedInstanceKeys();
+        return client.createOrUpdateAsync(this.resourceGroupName, this.managedInstanceName, this.keyName, this.inner())
+            .map(innerToFluentMap(this));
+    }
+
+    @Override
+    protected Observable<ManagedInstanceKeyInner> getInnerAsync() {
+        ManagedInstanceKeysInner client = this.manager().inner().managedInstanceKeys();
+        return client.getAsync(this.resourceGroupName, this.managedInstanceName, this.keyName);
+    }
+
+    @Override
+    public boolean isInCreateMode() {
+        return this.inner().id() == null;
+    }
+
+
+    @Override
+    public DateTime creationDate() {
+        return this.inner().creationDate();
+    }
+
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
+    @Override
+    public String kind() {
+        return this.inner().kind();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
+    @Override
+    public ServerKeyType serverKeyType() {
+        return this.inner().serverKeyType();
+    }
+
+    @Override
+    public String thumbprint() {
+        return this.inner().thumbprint();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
+    @Override
+    public String uri() {
+        return this.inner().uri();
+    }
+
+    @Override
+    public ManagedInstanceKeyImpl withExistingManagedInstance(String resourceGroupName, String managedInstanceName) {
+        this.resourceGroupName = resourceGroupName;
+        this.managedInstanceName = managedInstanceName;
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceKeyImpl withServerKeyType(ServerKeyType serverKeyType) {
+        this.inner().withServerKeyType(serverKeyType);
+        return this;
+    }
+
+    @Override
+    public ManagedInstanceKeyImpl withUri(String uri) {
+        this.inner().withUri(uri);
+        return this;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyInner.java
new file mode 100644
index 000000000000..a47293a0e0b4
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeyInner.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ServerKeyType;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * A managed instance key.
+ */
+@JsonFlatten
+public class ManagedInstanceKeyInner extends ProxyResource {
+    /**
+     * Kind of encryption protector. This is metadata used for the Azure portal
+     * experience.
+     */
+    @JsonProperty(value = "kind", access = JsonProperty.Access.WRITE_ONLY)
+    private String kind;
+
+    /**
+     * The key type like 'ServiceManaged', 'AzureKeyVault'. Possible values
+     * include: 'ServiceManaged', 'AzureKeyVault'.
+     */
+    @JsonProperty(value = "properties.serverKeyType", required = true)
+    private ServerKeyType serverKeyType;
+
+    /**
+     * The URI of the key. If the ServerKeyType is AzureKeyVault, then the URI
+     * is required.
+     */
+    @JsonProperty(value = "properties.uri")
+    private String uri;
+
+    /**
+     * Thumbprint of the key.
+     */
+    @JsonProperty(value = "properties.thumbprint", access = JsonProperty.Access.WRITE_ONLY)
+    private String thumbprint;
+
+    /**
+     * The key creation date.
+     */
+    @JsonProperty(value = "properties.creationDate", access = JsonProperty.Access.WRITE_ONLY)
+    private DateTime creationDate;
+
+    /**
+     * Get kind of encryption protector. This is metadata used for the Azure portal experience.
+     *
+     * @return the kind value
+     */
+    public String kind() {
+        return this.kind;
+    }
+
+    /**
+     * Get the key type like 'ServiceManaged', 'AzureKeyVault'. Possible values include: 'ServiceManaged', 'AzureKeyVault'.
+     *
+     * @return the serverKeyType value
+     */
+    public ServerKeyType serverKeyType() {
+        return this.serverKeyType;
+    }
+
+    /**
+     * Set the key type like 'ServiceManaged', 'AzureKeyVault'. Possible values include: 'ServiceManaged', 'AzureKeyVault'.
+     *
+     * @param serverKeyType the serverKeyType value to set
+     * @return the ManagedInstanceKeyInner object itself.
+     */
+    public ManagedInstanceKeyInner withServerKeyType(ServerKeyType serverKeyType) {
+        this.serverKeyType = serverKeyType;
+        return this;
+    }
+
+    /**
+     * Get the URI of the key. If the ServerKeyType is AzureKeyVault, then the URI is required.
+     *
+     * @return the uri value
+     */
+    public String uri() {
+        return this.uri;
+    }
+
+    /**
+     * Set the URI of the key. If the ServerKeyType is AzureKeyVault, then the URI is required.
+     *
+     * @param uri the uri value to set
+     * @return the ManagedInstanceKeyInner object itself.
+     */
+    public ManagedInstanceKeyInner withUri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    /**
+     * Get thumbprint of the key.
+     *
+     * @return the thumbprint value
+     */
+    public String thumbprint() {
+        return this.thumbprint;
+    }
+
+    /**
+     * Get the key creation date.
+     *
+     * @return the creationDate value
+     */
+    public DateTime creationDate() {
+        return this.creationDate;
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysImpl.java
new file mode 100644
index 000000000000..5ec3eb2e0a0a
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysImpl.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ *
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
+import rx.Completable;
+import rx.Observable;
+import rx.functions.Func1;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKey;
+
+class ManagedInstanceKeysImpl extends WrapperImpl<ManagedInstanceKeysInner> implements ManagedInstanceKeys {
+    private final SqlManager manager;
+
+    ManagedInstanceKeysImpl(SqlManager manager) {
+        super(manager.inner().managedInstanceKeys());
+        this.manager = manager;
+    }
+
+    public SqlManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public ManagedInstanceKeyImpl define(String name) {
+        return wrapModel(name);
+    }
+
+    private ManagedInstanceKeyImpl wrapModel(ManagedInstanceKeyInner inner) {
+        return  new ManagedInstanceKeyImpl(inner, manager());
+    }
+
+    private ManagedInstanceKeyImpl wrapModel(String name) {
+        return new ManagedInstanceKeyImpl(name, this.manager());
+    }
+
+    @Override
+    public Observable<ManagedInstanceKey> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        ManagedInstanceKeysInner client = this.inner();
+        return client.listByInstanceAsync(resourceGroupName, managedInstanceName)
+        .flatMapIterable(new Func1<Page<ManagedInstanceKeyInner>, Iterable<ManagedInstanceKeyInner>>() {
+            @Override
+            public Iterable<ManagedInstanceKeyInner> call(Page<ManagedInstanceKeyInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<ManagedInstanceKeyInner, ManagedInstanceKey>() {
+            @Override
+            public ManagedInstanceKey call(ManagedInstanceKeyInner inner) {
+                return wrapModel(inner);
+            }
+        });
+    }
+
+    @Override
+    public Observable<ManagedInstanceKey> getAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        ManagedInstanceKeysInner client = this.inner();
+        return client.getAsync(resourceGroupName, managedInstanceName, keyName)
+        .map(new Func1<ManagedInstanceKeyInner, ManagedInstanceKey>() {
+            @Override
+            public ManagedInstanceKey call(ManagedInstanceKeyInner inner) {
+                return wrapModel(inner);
+            }
+       });
+    }
+
+    @Override
+    public Completable deleteAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        ManagedInstanceKeysInner client = this.inner();
+        return client.deleteAsync(resourceGroupName, managedInstanceName, keyName).toCompletable();
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysInner.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysInner.java
new file mode 100644
index 000000000000..ed9e145496dd
--- /dev/null
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/ManagedInstanceKeysInner.java
@@ -0,0 +1,899 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.sql.v2017_10_01_preview.implementation;
+
+import retrofit2.Retrofit;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.ListOperationCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceFuture;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
+import okhttp3.ResponseBody;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
+import retrofit2.http.PUT;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+import retrofit2.Response;
+import rx.functions.Func1;
+import rx.Observable;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in ManagedInstanceKeys.
+ */
+public class ManagedInstanceKeysInner {
+    /** The Retrofit service to perform REST calls. */
+    private ManagedInstanceKeysService service;
+    /** The service client containing this operation class. */
+    private SqlManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedInstanceKeysInner.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public ManagedInstanceKeysInner(Retrofit retrofit, SqlManagementClientImpl client) {
+        this.service = retrofit.create(ManagedInstanceKeysService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ManagedInstanceKeys to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface ManagedInstanceKeysService {
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys listByInstance" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys")
+        Observable<Response<ResponseBody>> listByInstance(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys get" })
+        @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys/{keyName}")
+        Observable<Response<ResponseBody>> get(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys createOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys/{keyName}")
+        Observable<Response<ResponseBody>> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceKeyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys beginCreateOrUpdate" })
+        @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys/{keyName}")
+        Observable<Response<ResponseBody>> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Body ManagedInstanceKeyInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys delete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys/{keyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> delete(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys beginDelete" })
+        @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/keys/{keyName}", method = "DELETE", hasBody = true)
+        Observable<Response<ResponseBody>> beginDelete(@Path("resourceGroupName") String resourceGroupName, @Path("managedInstanceName") String managedInstanceName, @Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys listByInstanceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByInstanceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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 PagedList&lt;ManagedInstanceKeyInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceKeyInner> listByInstance(final String resourceGroupName, final String managedInstanceName) {
+        ServiceResponse<Page<ManagedInstanceKeyInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName).toBlocking().single();
+        return new PagedList<ManagedInstanceKeyInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceKeyInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @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<List<ManagedInstanceKeyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final ListOperationCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceKeyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Page<ManagedInstanceKeyInner>>() {
+                @Override
+                public Page<ManagedInstanceKeyInner> call(ServiceResponse<Page<ManagedInstanceKeyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(ServiceResponse<Page<ManagedInstanceKeyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceKeyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        final String filter = null;
+        return service.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceKeyInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceKeyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @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 PagedList&lt;ManagedInstanceKeyInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceKeyInner> listByInstance(final String resourceGroupName, final String managedInstanceName, final String filter) {
+        ServiceResponse<Page<ManagedInstanceKeyInner>> response = listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName, filter).toBlocking().single();
+        return new PagedList<ManagedInstanceKeyInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceKeyInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @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<List<ManagedInstanceKeyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final String filter, final ListOperationCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName, filter),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceKeyInner>> listByInstanceAsync(final String resourceGroupName, final String managedInstanceName, final String filter) {
+        return listByInstanceWithServiceResponseAsync(resourceGroupName, managedInstanceName, filter)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Page<ManagedInstanceKeyInner>>() {
+                @Override
+                public Page<ManagedInstanceKeyInner> call(ServiceResponse<Page<ManagedInstanceKeyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceWithServiceResponseAsync(final String resourceGroupName, final String managedInstanceName, final String filter) {
+        return listByInstanceSinglePageAsync(resourceGroupName, managedInstanceName, filter)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(ServiceResponse<Page<ManagedInstanceKeyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceKeyInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl<ManagedInstanceKeyInner>> * @param managedInstanceName The name of the managed instance.
+    ServiceResponse<PageImpl<ManagedInstanceKeyInner>> * @param filter An OData filter expression that filters elements in the collection.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceKeyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceSinglePageAsync(final String resourceGroupName, final String managedInstanceName, final String filter) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.listByInstance(resourceGroupName, managedInstanceName, this.client.subscriptionId(), filter, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceKeyInner>> result = listByInstanceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceKeyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceKeyInner>> listByInstanceDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceKeyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceKeyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be retrieved.
+     * @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 ManagedInstanceKeyInner object if successful.
+     */
+    public ManagedInstanceKeyInner get(String resourceGroupName, String managedInstanceName, String keyName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).toBlocking().single().body();
+    }
+
+    /**
+     * Gets a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be retrieved.
+     * @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<ManagedInstanceKeyInner> getAsync(String resourceGroupName, String managedInstanceName, String keyName, final ServiceCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName), serviceCallback);
+    }
+
+    /**
+     * Gets a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceKeyInner object
+     */
+    public Observable<ManagedInstanceKeyInner> getAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        return getWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).map(new Func1<ServiceResponse<ManagedInstanceKeyInner>, ManagedInstanceKeyInner>() {
+            @Override
+            public ManagedInstanceKeyInner call(ServiceResponse<ManagedInstanceKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Gets a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be retrieved.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceKeyInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceKeyInner>> getWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.get(resourceGroupName, managedInstanceName, keyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceKeyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceKeyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceKeyInner> clientResponse = getDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceKeyInner> getDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceKeyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceKeyInner>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @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 ManagedInstanceKeyInner object if successful.
+     */
+    public ManagedInstanceKeyInner createOrUpdate(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters).toBlocking().last().body();
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @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<ManagedInstanceKeyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters, final ServiceCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ManagedInstanceKeyInner> createOrUpdateAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        return createOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters).map(new Func1<ServiceResponse<ManagedInstanceKeyInner>, ManagedInstanceKeyInner>() {
+            @Override
+            public ManagedInstanceKeyInner call(ServiceResponse<ManagedInstanceKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<ManagedInstanceKeyInner>> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        Observable<Response<ResponseBody>> observable = service.createOrUpdate(resourceGroupName, managedInstanceName, keyName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken<ManagedInstanceKeyInner>() { }.getType());
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @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 ManagedInstanceKeyInner object if successful.
+     */
+    public ManagedInstanceKeyInner beginCreateOrUpdate(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters).toBlocking().single().body();
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @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<ManagedInstanceKeyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters, final ServiceCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return ServiceFuture.fromResponse(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters), serviceCallback);
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceKeyInner object
+     */
+    public Observable<ManagedInstanceKeyInner> beginCreateOrUpdateAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName, parameters).map(new Func1<ServiceResponse<ManagedInstanceKeyInner>, ManagedInstanceKeyInner>() {
+            @Override
+            public ManagedInstanceKeyInner call(ServiceResponse<ManagedInstanceKeyInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Creates or updates a managed instance key.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be operated on (updated or created).
+     * @param parameters The requested managed instance key resource state.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the ManagedInstanceKeyInner object
+     */
+    public Observable<ServiceResponse<ManagedInstanceKeyInner>> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String keyName, ManagedInstanceKeyInner parameters) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
+        }
+        if (parameters == null) {
+            throw new IllegalArgumentException("Parameter parameters is required and cannot be null.");
+        }
+        if (this.client.apiVersion() == null) {
+            throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+        }
+        Validator.validate(parameters);
+        return service.beginCreateOrUpdate(resourceGroupName, managedInstanceName, keyName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<ManagedInstanceKeyInner>>>() {
+                @Override
+                public Observable<ServiceResponse<ManagedInstanceKeyInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<ManagedInstanceKeyInner> clientResponse = beginCreateOrUpdateDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<ManagedInstanceKeyInner> beginCreateOrUpdateDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<ManagedInstanceKeyInner, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<ManagedInstanceKeyInner>() { }.getType())
+                .register(201, new TypeToken<ManagedInstanceKeyInner>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @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
+     */
+    public void delete(String resourceGroupName, String managedInstanceName, String keyName) {
+        deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).toBlocking().last().body();
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @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<Void> deleteAsync(String resourceGroupName, String managedInstanceName, String keyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<Void> deleteAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        return deleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.delete(resourceGroupName, managedInstanceName, keyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @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
+     */
+    public void beginDelete(String resourceGroupName, String managedInstanceName, String keyName) {
+        beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).toBlocking().single().body();
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @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<Void> beginDeleteAsync(String resourceGroupName, String managedInstanceName, String keyName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName), serviceCallback);
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<Void> beginDeleteAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        return beginDeleteWithServiceResponseAsync(resourceGroupName, managedInstanceName, keyName).map(new Func1<ServiceResponse<Void>, Void>() {
+            @Override
+            public Void call(ServiceResponse<Void> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Deletes the managed instance key with the given name.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param managedInstanceName The name of the managed instance.
+     * @param keyName The name of the managed instance key to be deleted.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public Observable<ServiceResponse<Void>> beginDeleteWithServiceResponseAsync(String resourceGroupName, String managedInstanceName, String keyName) {
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (managedInstanceName == null) {
+            throw new IllegalArgumentException("Parameter managedInstanceName is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.subscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.subscriptionId() 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.beginDelete(resourceGroupName, managedInstanceName, keyName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
+                @Override
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<Void> clientResponse = beginDeleteDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
+                .register(204, new TypeToken<Void>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @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 PagedList&lt;ManagedInstanceKeyInner&gt; object if successful.
+     */
+    public PagedList<ManagedInstanceKeyInner> listByInstanceNext(final String nextPageLink) {
+        ServiceResponse<Page<ManagedInstanceKeyInner>> response = listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<ManagedInstanceKeyInner>(response.body()) {
+            @Override
+            public Page<ManagedInstanceKeyInner> nextPage(String nextPageLink) {
+                return listByInstanceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @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<List<ManagedInstanceKeyInner>> listByInstanceNextAsync(final String nextPageLink, final ServiceFuture<List<ManagedInstanceKeyInner>> serviceFuture, final ListOperationCallback<ManagedInstanceKeyInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByInstanceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(String nextPageLink) {
+                    return listByInstanceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<Page<ManagedInstanceKeyInner>> listByInstanceNextAsync(final String nextPageLink) {
+        return listByInstanceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Page<ManagedInstanceKeyInner>>() {
+                @Override
+                public Page<ManagedInstanceKeyInner> call(ServiceResponse<Page<ManagedInstanceKeyInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;ManagedInstanceKeyInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByInstanceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<ManagedInstanceKeyInner>>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(ServiceResponse<Page<ManagedInstanceKeyInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByInstanceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets a list of managed instance keys.
+     *
+    ServiceResponse<PageImpl<ManagedInstanceKeyInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;ManagedInstanceKeyInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> listByInstanceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listByInstanceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<ManagedInstanceKeyInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<ManagedInstanceKeyInner>> result = listByInstanceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<ManagedInstanceKeyInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<ManagedInstanceKeyInner>> listByInstanceNextDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl<ManagedInstanceKeyInner>, CloudException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl<ManagedInstanceKeyInner>>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
+}
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
index b432eec9c06a..296cf77e0688 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManagementClientImpl.java
@@ -262,6 +262,32 @@ public ManagedInstanceTdeCertificatesInner managedInstanceTdeCertificates() {
         return this.managedInstanceTdeCertificates;
     }
 
+    /**
+     * The ManagedInstanceKeysInner object to access its operations.
+     */
+    private ManagedInstanceKeysInner managedInstanceKeys;
+
+    /**
+     * Gets the ManagedInstanceKeysInner object to access its operations.
+     * @return the ManagedInstanceKeysInner object.
+     */
+    public ManagedInstanceKeysInner managedInstanceKeys() {
+        return this.managedInstanceKeys;
+    }
+
+    /**
+     * The ManagedInstanceEncryptionProtectorsInner object to access its operations.
+     */
+    private ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtectors;
+
+    /**
+     * Gets the ManagedInstanceEncryptionProtectorsInner object to access its operations.
+     * @return the ManagedInstanceEncryptionProtectorsInner object.
+     */
+    public ManagedInstanceEncryptionProtectorsInner managedInstanceEncryptionProtectors() {
+        return this.managedInstanceEncryptionProtectors;
+    }
+
     /**
      * Initializes an instance of SqlManagementClient client.
      *
@@ -307,6 +333,8 @@ protected void initialize() {
         this.backupShortTermRetentionPolicies = new BackupShortTermRetentionPoliciesInner(restClient().retrofit(), this);
         this.tdeCertificates = new TdeCertificatesInner(restClient().retrofit(), this);
         this.managedInstanceTdeCertificates = new ManagedInstanceTdeCertificatesInner(restClient().retrofit(), this);
+        this.managedInstanceKeys = new ManagedInstanceKeysInner(restClient().retrofit(), this);
+        this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsInner(restClient().retrofit(), this);
         this.azureClient = new AzureClient(this);
     }
 
diff --git a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
index b0ae252b7525..6677354b17e3 100644
--- a/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
+++ b/sql/resource-manager/v2017_10_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_10_01_preview/implementation/SqlManager.java
@@ -26,6 +26,8 @@
 import com.microsoft.azure.management.sql.v2017_10_01_preview.BackupShortTermRetentionPolicies;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.TdeCertificates;
 import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceTdeCertificates;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceKeys;
+import com.microsoft.azure.management.sql.v2017_10_01_preview.ManagedInstanceEncryptionProtectors;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
 import com.microsoft.azure.arm.resources.implementation.ManagerCore;
 
@@ -43,6 +45,8 @@ public final class SqlManager extends ManagerCore<SqlManager, SqlManagementClien
     private BackupShortTermRetentionPolicies backupShortTermRetentionPolicies;
     private TdeCertificates tdeCertificates;
     private ManagedInstanceTdeCertificates managedInstanceTdeCertificates;
+    private ManagedInstanceKeys managedInstanceKeys;
+    private ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors;
     /**
     * Get a Configurable instance that can be used to create SqlManager with optional configuration.
     *
@@ -190,6 +194,26 @@ public ManagedInstanceTdeCertificates managedInstanceTdeCertificates() {
         return this.managedInstanceTdeCertificates;
     }
 
+    /**
+     * @return Entry point to manage ManagedInstanceKeys.
+     */
+    public ManagedInstanceKeys managedInstanceKeys() {
+        if (this.managedInstanceKeys == null) {
+            this.managedInstanceKeys = new ManagedInstanceKeysImpl(this);
+        }
+        return this.managedInstanceKeys;
+    }
+
+    /**
+     * @return Entry point to manage ManagedInstanceEncryptionProtectors.
+     */
+    public ManagedInstanceEncryptionProtectors managedInstanceEncryptionProtectors() {
+        if (this.managedInstanceEncryptionProtectors == null) {
+            this.managedInstanceEncryptionProtectors = new ManagedInstanceEncryptionProtectorsImpl(this);
+        }
+        return this.managedInstanceEncryptionProtectors;
+    }
+
     /**
     * The implementation for Configurable interface.
     */