diff --git a/sdk/compute/mgmt-v2018_04_01/pom.xml b/sdk/compute/mgmt-v2018_04_01/pom.xml
index 04828ca27096c..aa50a52a1b517 100644
--- a/sdk/compute/mgmt-v2018_04_01/pom.xml
+++ b/sdk/compute/mgmt-v2018_04_01/pom.xml
@@ -11,15 +11,15 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.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>
+    <url>https://github.com/Azure/azure-sdk-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-libraries-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
+        <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>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
index a87d4de13915c..fc7b1af28ba8b 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
index 7c48e8958d0f9..61e0c60b27973 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
+++ b/sdk/compute/mgmt-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;
@@ -99,56 +99,68 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithCreationData {
            /**
             * Specifies creationData.
-            */
+            * @param creationData Disk source information. CreationData information cannot be changed after the disk has been created
+            * @return the next definition stage
+*/
             WithCreate withCreationData(CreationData creationData);
         }
 
         /**
-         * The stage of the disk update allowing to specify DiskSizeGB.
+         * The stage of the disk definition allowing to specify DiskSizeGB.
          */
         interface WithDiskSizeGB {
             /**
              * Specifies diskSizeGB.
+             * @param diskSizeGB 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 next definition stage
              */
             WithCreate withDiskSizeGB(Integer diskSizeGB);
         }
 
         /**
-         * The stage of the disk update allowing to specify EncryptionSettings.
+         * The stage of the disk definition allowing to specify EncryptionSettings.
          */
         interface WithEncryptionSettings {
             /**
              * Specifies encryptionSettings.
+             * @param encryptionSettings Encryption settings for disk or snapshot
+             * @return the next definition stage
              */
             WithCreate withEncryptionSettings(EncryptionSettings encryptionSettings);
         }
 
         /**
-         * The stage of the disk update allowing to specify OsType.
+         * The stage of the disk definition allowing to specify OsType.
          */
         interface WithOsType {
             /**
              * Specifies osType.
+             * @param osType The Operating System type. Possible values include: 'Windows', 'Linux'
+             * @return the next definition stage
              */
             WithCreate withOsType(OperatingSystemTypes osType);
         }
 
         /**
-         * The stage of the disk update allowing to specify Sku.
+         * The stage of the disk definition allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
+             * @param sku the sku parameter value
+             * @return the next definition stage
              */
             WithCreate withSku(DiskSku sku);
         }
 
         /**
-         * The stage of the disk update allowing to specify Zones.
+         * The stage of the disk definition allowing to specify Zones.
          */
         interface WithZones {
             /**
              * Specifies zones.
+             * @param zones The Logical zone list for Disk
+             * @return the next definition stage
              */
             WithCreate withZones(List<String> zones);
         }
@@ -172,41 +184,49 @@ interface Update extends Appliable<Disk>, Resource.UpdateWithTags<Update>, Updat
      */
     interface UpdateStages {
         /**
-         * The stage of the disk {0} allowing to specify DiskSizeGB.
+         * The stage of the disk update allowing to specify DiskSizeGB.
          */
         interface WithDiskSizeGB {
             /**
              * Specifies diskSizeGB.
+             * @param diskSizeGB 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 next update stage
              */
             Update withDiskSizeGB(Integer diskSizeGB);
         }
 
         /**
-         * The stage of the disk {0} allowing to specify EncryptionSettings.
+         * The stage of the disk update allowing to specify EncryptionSettings.
          */
         interface WithEncryptionSettings {
             /**
              * Specifies encryptionSettings.
+             * @param encryptionSettings Encryption settings for disk or snapshot
+             * @return the next update stage
              */
             Update withEncryptionSettings(EncryptionSettings encryptionSettings);
         }
 
         /**
-         * The stage of the disk {0} allowing to specify OsType.
+         * The stage of the disk update allowing to specify OsType.
          */
         interface WithOsType {
             /**
              * Specifies osType.
+             * @param osType the Operating System type. Possible values include: 'Windows', 'Linux'
+             * @return the next update stage
              */
             Update withOsType(OperatingSystemTypes osType);
         }
 
         /**
-         * The stage of the disk {0} allowing to specify Sku.
+         * The stage of the disk update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
+             * @param sku the sku parameter value
+             * @return the next update stage
              */
             Update withSku(DiskSku sku);
         }
diff --git a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
index 097f3fb3ec283..67754d4666096 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
index f5602037c9d5d..feb7386edaa16 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java
index a5241ab8fc1ce..fc35f8a0efdb3 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/EncryptionSettings.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java
index 2acd3f446e0b0..9900d5d6e582f 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/GrantAccessData.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
index cc8e4681e2e8c..8bf454e778a6b 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
+++ b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/ImageDiskReference.java
@@ -15,7 +15,7 @@
  */
 public class ImageDiskReference {
     /**
-     * A relative uri containing either a Platform Imgage Repository or user
+     * A relative uri containing either a Platform Image Repository or user
      * image reference.
      */
     @JsonProperty(value = "id", required = true)
@@ -30,7 +30,7 @@ public class ImageDiskReference {
     private Integer lun;
 
     /**
-     * Get the id value.
+     * Get a relative uri containing either a Platform Image 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 Image 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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java
index 90267cab5b20f..1c6f73aa511c8 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndKeyReference.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java
index 6c10230ace1ed..7401445d48ae3 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/KeyVaultAndSecretReference.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java
index 92adc46738186..545fed5986eac 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Snapshot.java
+++ b/sdk/compute/mgmt-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;
@@ -93,46 +93,56 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithCreationData {
            /**
             * Specifies creationData.
-            */
+            * @param creationData Disk source information. CreationData information cannot be changed after the disk has been created
+            * @return the next definition stage
+*/
             WithCreate withCreationData(CreationData creationData);
         }
 
         /**
-         * The stage of the snapshot update allowing to specify DiskSizeGB.
+         * The stage of the snapshot definition allowing to specify DiskSizeGB.
          */
         interface WithDiskSizeGB {
             /**
              * Specifies diskSizeGB.
+             * @param diskSizeGB 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 next definition stage
              */
             WithCreate withDiskSizeGB(Integer diskSizeGB);
         }
 
         /**
-         * The stage of the snapshot update allowing to specify EncryptionSettings.
+         * The stage of the snapshot definition allowing to specify EncryptionSettings.
          */
         interface WithEncryptionSettings {
             /**
              * Specifies encryptionSettings.
+             * @param encryptionSettings Encryption settings for disk or snapshot
+             * @return the next definition stage
              */
             WithCreate withEncryptionSettings(EncryptionSettings encryptionSettings);
         }
 
         /**
-         * The stage of the snapshot update allowing to specify OsType.
+         * The stage of the snapshot definition allowing to specify OsType.
          */
         interface WithOsType {
             /**
              * Specifies osType.
+             * @param osType The Operating System type. Possible values include: 'Windows', 'Linux'
+             * @return the next definition stage
              */
             WithCreate withOsType(OperatingSystemTypes osType);
         }
 
         /**
-         * The stage of the snapshot update allowing to specify Sku.
+         * The stage of the snapshot definition allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
+             * @param sku the sku parameter value
+             * @return the next definition stage
              */
             WithCreate withSku(SnapshotSku sku);
         }
@@ -156,41 +166,49 @@ interface Update extends Appliable<Snapshot>, Resource.UpdateWithTags<Update>, U
      */
     interface UpdateStages {
         /**
-         * The stage of the snapshot {0} allowing to specify DiskSizeGB.
+         * The stage of the snapshot update allowing to specify DiskSizeGB.
          */
         interface WithDiskSizeGB {
             /**
              * Specifies diskSizeGB.
+             * @param diskSizeGB 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 next update stage
              */
             Update withDiskSizeGB(Integer diskSizeGB);
         }
 
         /**
-         * The stage of the snapshot {0} allowing to specify EncryptionSettings.
+         * The stage of the snapshot update allowing to specify EncryptionSettings.
          */
         interface WithEncryptionSettings {
             /**
              * Specifies encryptionSettings.
+             * @param encryptionSettings Encryption settings for disk or snapshot
+             * @return the next update stage
              */
             Update withEncryptionSettings(EncryptionSettings encryptionSettings);
         }
 
         /**
-         * The stage of the snapshot {0} allowing to specify OsType.
+         * The stage of the snapshot update allowing to specify OsType.
          */
         interface WithOsType {
             /**
              * Specifies osType.
+             * @param osType the Operating System type. Possible values include: 'Windows', 'Linux'
+             * @return the next update stage
              */
             Update withOsType(OperatingSystemTypes osType);
         }
 
         /**
-         * The stage of the snapshot {0} allowing to specify Sku.
+         * The stage of the snapshot update allowing to specify Sku.
          */
         interface WithSku {
             /**
              * Specifies sku.
+             * @param sku the sku parameter value
+             * @return the next update stage
              */
             Update withSku(SnapshotSku sku);
         }
diff --git a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java
index bc818ea5a01dc..22d99739aba34 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotSku.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java
index 12720526308cc..49b4e929c4221 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SnapshotUpdate.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
index d75a766895dec..f9b619ffa1136 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
+++ b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/SourceVault.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * The vault id is an Azure Resource Manager Resoure id in the form
+ * The vault id is an Azure Resource Manager Resource id in the form
  * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}.
  */
 public class SourceVault {
@@ -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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java
index 495a8e5b9ecee..08086adbdf0fc 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/StorageAccountTypes.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
index b58a3aee470a0..6c4de56561a03 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/AccessUriInner.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/ComputeManagementClientImpl.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/ComputeManagementClientImpl.java
index 6010e3b0fa52a..29798ce48ad5b 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/ComputeManagementClientImpl.java
+++ b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/ComputeManagementClientImpl.java
@@ -10,6 +10,8 @@
 
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.RestClient;
 
@@ -63,11 +65,11 @@ public String apiVersion() {
         return this.apiVersion;
     }
 
-    /** Gets or sets the preferred language for the response. */
+    /** The preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets Gets or sets the preferred language for the response.
+     * Gets The preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -76,7 +78,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets Gets or sets the preferred language for the response.
+     * Sets The preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -86,11 +88,11 @@ public ComputeManagementClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** 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.
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -99,7 +101,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -109,11 +111,11 @@ public ComputeManagementClientImpl withLongRunningOperationRetryTimeout(int long
         return this;
     }
 
-    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** 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. */
     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.
+     * 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.
      *
      * @return the generateClientRequestId value.
      */
@@ -122,7 +124,7 @@ public 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.
+     * 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.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -205,6 +207,6 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s)", super.userAgent(), "ComputeManagementClient", "2018-04-01");
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "ComputeManagementClient", "2018-04-01");
     }
 }
diff --git a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java
index b8252cad231da..f285a06883979 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DiskInner.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DisksInner.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DisksInner.java
index 0bcf0a550ee68..5060f7a909447 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DisksInner.java
+++ b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/DisksInner.java
@@ -41,6 +41,8 @@
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 
 /**
  * An instance of this class provides access to all the operations defined
@@ -1011,7 +1013,7 @@ public Observable<ServiceResponse<AccessUriInner>> grantAccessWithServiceRespons
         }
         Validator.validate(grantAccessData);
         Observable<Response<ResponseBody>> observable = service.grantAccess(this.client.subscriptionId(), resourceGroupName, diskName, this.client.apiVersion(), grantAccessData, this.client.acceptLanguage(), this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<AccessUriInner>() { }.getType());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<AccessUriInner>() { }.getType());
     }
 
     /**
@@ -1174,7 +1176,7 @@ public Observable<ServiceResponse<Void>> revokeAccessWithServiceResponseAsync(St
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         Observable<Response<ResponseBody>> observable = service.revokeAccess(this.client.subscriptionId(), resourceGroupName, diskName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
     }
 
     /**
diff --git a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java
index 572638ea16d6f..f2c3f31f7b07c 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotInner.java
+++ b/sdk/compute/mgmt-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/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotsInner.java b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotsInner.java
index 3b792dc6a90c9..2018d522be495 100644
--- a/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotsInner.java
+++ b/sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/implementation/SnapshotsInner.java
@@ -41,6 +41,8 @@
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 
 /**
  * An instance of this class provides access to all the operations defined
@@ -1011,7 +1013,7 @@ public Observable<ServiceResponse<AccessUriInner>> grantAccessWithServiceRespons
         }
         Validator.validate(grantAccessData);
         Observable<Response<ResponseBody>> observable = service.grantAccess(this.client.subscriptionId(), resourceGroupName, snapshotName, this.client.apiVersion(), grantAccessData, this.client.acceptLanguage(), this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<AccessUriInner>() { }.getType());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<AccessUriInner>() { }.getType());
     }
 
     /**
@@ -1174,7 +1176,7 @@ public Observable<ServiceResponse<Void>> revokeAccessWithServiceResponseAsync(St
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         Observable<Response<ResponseBody>> observable = service.revokeAccess(this.client.subscriptionId(), resourceGroupName, snapshotName, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent());
-        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<Void>() { }.getType());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
     }
 
     /**