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 54a98991df2a..9c8704fffeb5 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
@@ -12,9 +12,8 @@
 
 /**
  * Boot Diagnostics is a debugging feature which allows you to view Console
- * Output and Screenshot to diagnose VM status. <br><br> For Linux
- * Virtual Machines, you can easily view the output of your console log.
- * <br><br> For both Windows and Linux virtual machines, Azure also
+ * Output and Screenshot to diagnose VM status. <br><br> You can
+ * easily view the output of your console log. <br><br> Azure also
  * enables you to see a screenshot of the VM from the hypervisor.
  */
 public class BootDiagnostics {
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 e9b57e135648..f400de777263 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
@@ -17,13 +17,13 @@ public class BootDiagnosticsInstanceView {
     /**
      * The console screenshot blob URI.
      */
-    @JsonProperty(value = "consoleScreenshotBlobUri")
+    @JsonProperty(value = "consoleScreenshotBlobUri", access = JsonProperty.Access.WRITE_ONLY)
     private String consoleScreenshotBlobUri;
 
     /**
      * The Linux serial console log blob Uri.
      */
-    @JsonProperty(value = "serialConsoleLogBlobUri")
+    @JsonProperty(value = "serialConsoleLogBlobUri", access = JsonProperty.Access.WRITE_ONLY)
     private String serialConsoleLogBlobUri;
 
     /**
@@ -35,17 +35,6 @@ public String consoleScreenshotBlobUri() {
         return this.consoleScreenshotBlobUri;
     }
 
-    /**
-     * Set the console screenshot blob URI.
-     *
-     * @param consoleScreenshotBlobUri the consoleScreenshotBlobUri value to set
-     * @return the BootDiagnosticsInstanceView object itself.
-     */
-    public BootDiagnosticsInstanceView withConsoleScreenshotBlobUri(String consoleScreenshotBlobUri) {
-        this.consoleScreenshotBlobUri = consoleScreenshotBlobUri;
-        return this;
-    }
-
     /**
      * Get the Linux serial console log blob Uri.
      *
@@ -55,15 +44,4 @@ public String serialConsoleLogBlobUri() {
         return this.serialConsoleLogBlobUri;
     }
 
-    /**
-     * Set the Linux serial console log blob Uri.
-     *
-     * @param serialConsoleLogBlobUri the serialConsoleLogBlobUri value to set
-     * @return the BootDiagnosticsInstanceView object itself.
-     */
-    public BootDiagnosticsInstanceView withSerialConsoleLogBlobUri(String serialConsoleLogBlobUri) {
-        this.serialConsoleLogBlobUri = serialConsoleLogBlobUri;
-        return this;
-    }
-
 }
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 3fc9ba6886e3..ad1efe83282e 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
@@ -17,9 +17,8 @@
 public class DiagnosticsProfile {
     /**
      * Boot Diagnostics is a debugging feature which allows you to view Console
-     * Output and Screenshot to diagnose VM status. <br><br> For
-     * Linux Virtual Machines, you can easily view the output of your console
-     * log. <br><br> For both Windows and Linux virtual machines,
+     * Output and Screenshot to diagnose VM status. <br><br> You
+     * can easily view the output of your console log. <br><br>
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -27,7 +26,7 @@ public class DiagnosticsProfile {
     private BootDiagnostics bootDiagnostics;
 
     /**
-     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual Machines, you can easily view the output of your console log. <br><br> For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
+     * Get boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. <br><br> You can easily view the output of your console log. <br><br> Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -36,7 +35,7 @@ public BootDiagnostics bootDiagnostics() {
     }
 
     /**
-     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual Machines, you can easily view the output of your console log. <br><br> For both Windows and Linux virtual machines, Azure also enables you to see a screenshot of the VM from the hypervisor.
+     * Set boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status. <br><br> You can easily view the output of your console log. <br><br> 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/VirtualMachine.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachine.java
index d91d3c66f51c..81edce0f1367 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
@@ -9,23 +9,21 @@
 package com.microsoft.azure.management.compute.v2017_03_30;
 
 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.management.compute.v2017_03_30.implementation.VirtualMachineInner;
+import com.microsoft.azure.arm.model.Indexable;
 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.compute.v2017_03_30.implementation.ComputeManager;
+import java.util.Map;
 import com.microsoft.azure.SubResource;
 import java.util.List;
-import com.microsoft.azure.management.compute.v2017_03_30.implementation.VirtualMachineInner;
 
 /**
  * Type representing VirtualMachine.
  */
-public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource, GroupableResourceCore<ComputeManager, VirtualMachineInner>, HasResourceGroup, Refreshable<VirtualMachine>, Updatable<VirtualMachine.Update>, HasManager<ComputeManager> {
+public interface VirtualMachine extends HasInner<VirtualMachineInner>, Indexable, Updatable<VirtualMachine.Update>, HasManager<ComputeManager> {
     /**
      * @return the availabilitySet value.
      */
@@ -41,6 +39,11 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     HardwareProfile hardwareProfile();
 
+    /**
+     * @return the id value.
+     */
+    String id();
+
     /**
      * @return the identity value.
      */
@@ -56,6 +59,16 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     String licenseType();
 
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
     /**
      * @return the networkProfile value.
      */
@@ -86,6 +99,16 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     StorageProfile storageProfile();
 
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
     /**
      * @return the vmId value.
      */
@@ -99,7 +122,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
     /**
      * The entirety of the VirtualMachine definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
     }
 
     /**
@@ -109,17 +132,31 @@ interface DefinitionStages {
         /**
          * The first stage of a VirtualMachine definition.
          */
-        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        interface Blank extends WithLocation {
         }
 
         /**
-         * The stage of the VirtualMachine definition allowing to specify the resource group.
+         * The stage of the virtualmachine definition allowing to specify Location.
          */
-        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        interface WithLocation {
+           /**
+            * Specifies resourceGroupName.
+            */
+            WithLocation withExistingLocation(String resourceGroupName);
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify AvailabilitySet.
+         * The stage of the virtualmachine definition allowing to specify Location.
+         */
+        interface WithLocation {
+           /**
+            * Specifies location.
+            */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the virtualmachine definition allowing to specify AvailabilitySet.
          */
         interface WithAvailabilitySet {
             /**
@@ -129,7 +166,7 @@ interface WithAvailabilitySet {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify DiagnosticsProfile.
+         * The stage of the virtualmachine definition allowing to specify DiagnosticsProfile.
          */
         interface WithDiagnosticsProfile {
             /**
@@ -139,7 +176,7 @@ interface WithDiagnosticsProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify HardwareProfile.
+         * The stage of the virtualmachine definition allowing to specify HardwareProfile.
          */
         interface WithHardwareProfile {
             /**
@@ -149,7 +186,7 @@ interface WithHardwareProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Identity.
+         * The stage of the virtualmachine definition allowing to specify Identity.
          */
         interface WithIdentity {
             /**
@@ -159,7 +196,7 @@ interface WithIdentity {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify LicenseType.
+         * The stage of the virtualmachine definition allowing to specify LicenseType.
          */
         interface WithLicenseType {
             /**
@@ -169,7 +206,7 @@ interface WithLicenseType {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify NetworkProfile.
+         * The stage of the virtualmachine definition allowing to specify NetworkProfile.
          */
         interface WithNetworkProfile {
             /**
@@ -179,7 +216,7 @@ interface WithNetworkProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify OsProfile.
+         * The stage of the virtualmachine definition allowing to specify OsProfile.
          */
         interface WithOsProfile {
             /**
@@ -189,7 +226,7 @@ interface WithOsProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Plan.
+         * The stage of the virtualmachine definition allowing to specify Plan.
          */
         interface WithPlan {
             /**
@@ -199,7 +236,7 @@ interface WithPlan {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify StorageProfile.
+         * The stage of the virtualmachine definition allowing to specify StorageProfile.
          */
         interface WithStorageProfile {
             /**
@@ -209,7 +246,17 @@ interface WithStorageProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Zones.
+         * The stage of the virtualmachine definition allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the virtualmachine definition allowing to specify Zones.
          */
         interface WithZones {
             /**
@@ -223,13 +270,13 @@ interface WithZones {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<VirtualMachine>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAvailabilitySet, DefinitionStages.WithDiagnosticsProfile, DefinitionStages.WithHardwareProfile, DefinitionStages.WithIdentity, DefinitionStages.WithLicenseType, DefinitionStages.WithNetworkProfile, DefinitionStages.WithOsProfile, DefinitionStages.WithPlan, DefinitionStages.WithStorageProfile, DefinitionStages.WithZones {
+        interface WithCreate extends Creatable<VirtualMachine>, DefinitionStages.WithAvailabilitySet, DefinitionStages.WithDiagnosticsProfile, DefinitionStages.WithHardwareProfile, DefinitionStages.WithIdentity, DefinitionStages.WithLicenseType, DefinitionStages.WithNetworkProfile, DefinitionStages.WithOsProfile, DefinitionStages.WithPlan, DefinitionStages.WithStorageProfile, DefinitionStages.WithTags, DefinitionStages.WithZones {
         }
     }
     /**
      * The template for a VirtualMachine update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<VirtualMachine>, Resource.UpdateWithTags<Update>, UpdateStages.WithAvailabilitySet, UpdateStages.WithDiagnosticsProfile, UpdateStages.WithHardwareProfile, UpdateStages.WithIdentity, UpdateStages.WithLicenseType, UpdateStages.WithNetworkProfile, UpdateStages.WithOsProfile, UpdateStages.WithPlan, UpdateStages.WithStorageProfile, UpdateStages.WithZones {
+    interface Update extends Appliable<VirtualMachine>, UpdateStages.WithAvailabilitySet, UpdateStages.WithDiagnosticsProfile, UpdateStages.WithHardwareProfile, UpdateStages.WithIdentity, UpdateStages.WithLicenseType, UpdateStages.WithNetworkProfile, UpdateStages.WithOsProfile, UpdateStages.WithPlan, UpdateStages.WithStorageProfile, UpdateStages.WithTags, UpdateStages.WithZones {
     }
 
     /**
@@ -237,7 +284,7 @@ interface Update extends Appliable<VirtualMachine>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualmachine {0} allowing to specify AvailabilitySet.
+         * The stage of the virtualmachine update allowing to specify AvailabilitySet.
          */
         interface WithAvailabilitySet {
             /**
@@ -247,7 +294,7 @@ interface WithAvailabilitySet {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify DiagnosticsProfile.
+         * The stage of the virtualmachine update allowing to specify DiagnosticsProfile.
          */
         interface WithDiagnosticsProfile {
             /**
@@ -257,7 +304,7 @@ interface WithDiagnosticsProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify HardwareProfile.
+         * The stage of the virtualmachine update allowing to specify HardwareProfile.
          */
         interface WithHardwareProfile {
             /**
@@ -267,7 +314,7 @@ interface WithHardwareProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Identity.
+         * The stage of the virtualmachine update allowing to specify Identity.
          */
         interface WithIdentity {
             /**
@@ -277,7 +324,7 @@ interface WithIdentity {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify LicenseType.
+         * The stage of the virtualmachine update allowing to specify LicenseType.
          */
         interface WithLicenseType {
             /**
@@ -287,7 +334,7 @@ interface WithLicenseType {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify NetworkProfile.
+         * The stage of the virtualmachine update allowing to specify NetworkProfile.
          */
         interface WithNetworkProfile {
             /**
@@ -297,7 +344,7 @@ interface WithNetworkProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify OsProfile.
+         * The stage of the virtualmachine update allowing to specify OsProfile.
          */
         interface WithOsProfile {
             /**
@@ -307,7 +354,7 @@ interface WithOsProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Plan.
+         * The stage of the virtualmachine update allowing to specify Plan.
          */
         interface WithPlan {
             /**
@@ -317,7 +364,7 @@ interface WithPlan {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify StorageProfile.
+         * The stage of the virtualmachine update allowing to specify StorageProfile.
          */
         interface WithStorageProfile {
             /**
@@ -327,7 +374,17 @@ interface WithStorageProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Zones.
+         * The stage of the virtualmachine update allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the virtualmachine update allowing to specify Zones.
          */
         interface WithZones {
             /**
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensions.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensions.java
index b67f682b13af..a263720b6dd2 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensions.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachineExtensions.java
@@ -8,16 +8,20 @@
 
 package com.microsoft.azure.management.compute.v2017_03_30;
 
-import com.microsoft.azure.arm.collection.SupportsCreating;
-import rx.Completable;
 import rx.Observable;
-import com.microsoft.azure.management.compute.v2017_03_30.implementation.VirtualMachineExtensionsInner;
-import com.microsoft.azure.arm.model.HasInner;
+import rx.Completable;
 
 /**
  * Type representing VirtualMachineExtensions.
  */
-public interface VirtualMachineExtensions extends SupportsCreating<VirtualMachineExtension.DefinitionStages.Blank>, HasInner<VirtualMachineExtensionsInner> {
+public interface VirtualMachineExtensions {
+    /**
+     * Begins definition for a new Extension resource.
+     * @param name resource name.
+     * @return the first stage of the new Extension definition.
+     */
+    VirtualMachineExtension.DefinitionStages.Blank defineExtension(String name);
+
     /**
      * The operation to get the extension.
      *
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachines.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachines.java
index a3881f15dddd..f23a11d0163f 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachines.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/VirtualMachines.java
@@ -8,21 +8,31 @@
 
 package com.microsoft.azure.management.compute.v2017_03_30;
 
-import com.microsoft.azure.arm.collection.SupportsCreating;
-import com.microsoft.azure.arm.resources.collection.SupportsDeletingByResourceGroup;
-import com.microsoft.azure.arm.resources.collection.SupportsBatchDeletion;
-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.VirtualMachinesInner;
-import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachine;
+import rx.Completable;
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineVirtualMachineSize;
 
 /**
  * Type representing VirtualMachines.
  */
-public interface VirtualMachines extends SupportsCreating<VirtualMachine.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualMachine>, SupportsListingByResourceGroup<VirtualMachine>, SupportsListing<VirtualMachine>, HasInner<VirtualMachinesInner> {
+public interface VirtualMachines {
+    /**
+     * Begins definition for a new VirtualMachine resource.
+     * @param name resource name.
+     * @return the first stage of the new VirtualMachine definition.
+     */
+    VirtualMachine.DefinitionStages.Blank defineVirtualMachine(String name);
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listByLocationAsync(final String location);
+
     /**
      * Captures the VM by copying virtual hard disks of the VM and outputs a template that can be used to create similar VMs.
      *
@@ -34,6 +44,26 @@ public interface VirtualMachines extends SupportsCreating<VirtualMachine.Definit
      */
     Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters);
 
+    /**
+     * The operation to delete a virtual machine.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param vmName The name of the virtual machine.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OperationStatusResponse> deleteAsync(String resourceGroupName, String vmName);
+
+    /**
+     * Retrieves information about the model view or the instance view of a virtual machine.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param vmName The name of the virtual machine.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> getByResourceGroupAsync(String resourceGroupName, String vmName);
+
     /**
      * Retrieves information about the run-time state of a virtual machine.
      *
@@ -135,6 +165,23 @@ public interface VirtualMachines extends SupportsCreating<VirtualMachine.Definit
      */
     Observable<RunCommandResult> runCommandAsync(String resourceGroupName, String vmName, RunCommandInput parameters);
 
+    /**
+     * 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.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listByResourceGroupAsync(final String resourceGroupName);
+
+    /**
+     * 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.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listAsync();
+
     /**
      * The operation to get all extensions of a Virtual Machine.
      *
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsImpl.java
index bb4bab5f5d1d..9f72a176cabc 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineExtensionsImpl.java
@@ -4,17 +4,17 @@
  * license information.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
- *
+ * abc
  */
 
 package com.microsoft.azure.management.compute.v2017_03_30.implementation;
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineExtensions;
-import rx.Completable;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineExtension;
+import rx.Completable;
 
 class VirtualMachineExtensionsImpl extends WrapperImpl<VirtualMachineExtensionsInner> implements VirtualMachineExtensions {
     private final ComputeManager manager;
@@ -29,16 +29,24 @@ public ComputeManager manager() {
     }
 
     @Override
-    public VirtualMachineExtensionImpl define(String name) {
-        return wrapModel(name);
+    public VirtualMachineExtensionImpl defineExtension(String name) {
+        return wrapExtensionModel(name);
+    }
+
+    private VirtualMachineExtensionImpl wrapExtensionModel(String name) {
+        return new VirtualMachineExtensionImpl(name, this.manager());
     }
 
-    private VirtualMachineExtensionImpl wrapModel(VirtualMachineExtensionInner inner) {
+    private VirtualMachineExtensionImpl wrapVirtualMachineExtensionModel(VirtualMachineExtensionInner inner) {
         return  new VirtualMachineExtensionImpl(inner, manager());
     }
 
-    private VirtualMachineExtensionImpl wrapModel(String name) {
-        return new VirtualMachineExtensionImpl(name, this.manager());
+    private Observable<VirtualMachineExtensionInner> getVirtualMachineExtensionInnerUsingVirtualMachineExtensionsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String vmName = IdParsingUtils.getValueFromIdByName(id, "virtualMachines");
+        String vmExtensionName = IdParsingUtils.getValueFromIdByName(id, "extensions");
+        VirtualMachineExtensionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, vmName, vmExtensionName);
     }
 
     @Override
@@ -48,7 +56,7 @@ public Observable<VirtualMachineExtension> getAsync(String resourceGroupName, St
         .map(new Func1<VirtualMachineExtensionInner, VirtualMachineExtension>() {
             @Override
             public VirtualMachineExtension call(VirtualMachineExtensionInner inner) {
-                return wrapModel(inner);
+                return wrapVirtualMachineExtensionModel(inner);
             }
        });
     }
diff --git a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImpl.java b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImpl.java
index 58612679f40d..60c7fe6f67ed 100644
--- a/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImpl.java
+++ b/compute/resource-manager/v2017_03_30/src/main/java/com/microsoft/azure/management/compute/v2017_03_30/implementation/VirtualMachineImpl.java
@@ -8,9 +8,10 @@
 
 package com.microsoft.azure.management.compute.v2017_03_30.implementation;
 
-import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachine;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
+import java.util.Map;
 import com.microsoft.azure.management.compute.v2017_03_30.Plan;
 import com.microsoft.azure.management.compute.v2017_03_30.HardwareProfile;
 import com.microsoft.azure.management.compute.v2017_03_30.StorageProfile;
@@ -24,29 +25,53 @@
 import java.util.ArrayList;
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachineExtension;
 
-class VirtualMachineImpl extends GroupableResourceCoreImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl, ComputeManager> implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update {
-    VirtualMachineImpl(String name, VirtualMachineInner inner, ComputeManager manager) {
-        super(name, inner, manager);
+class VirtualMachineImpl extends CreatableUpdatableImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl> implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update {
+    private final ComputeManager manager;
+    private String resourceGroupName;
+    private String vmName;
+
+    VirtualMachineImpl(String name, ComputeManager manager) {
+        super(name, new VirtualMachineInner());
+        this.manager = manager;
+        // Set resource name
+        this.vmName = name;
+        //
+    }
+
+    VirtualMachineImpl(VirtualMachineInner inner, ComputeManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.vmName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.vmName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachines");
+        //
+    }
+
+    @Override
+    public ComputeManager manager() {
+        return this.manager;
     }
 
     @Override
     public Observable<VirtualMachine> createResourceAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+        return client.createOrUpdateAsync(this.resourceGroupName, this.vmName, this.inner())
             .map(innerToFluentMap(this));
     }
 
     @Override
     public Observable<VirtualMachine> updateResourceAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+        return client.createOrUpdateAsync(this.resourceGroupName, this.vmName, this.inner())
             .map(innerToFluentMap(this));
     }
 
     @Override
     protected Observable<VirtualMachineInner> getInnerAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+        return null; // NOP getInnerAsync implementation as get is not supported
     }
 
     @Override
@@ -70,6 +95,11 @@ public HardwareProfile hardwareProfile() {
         return this.inner().hardwareProfile();
     }
 
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
     @Override
     public VirtualMachineIdentity identity() {
         return this.inner().identity();
@@ -90,6 +120,16 @@ public String licenseType() {
         return this.inner().licenseType();
     }
 
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
     @Override
     public NetworkProfile networkProfile() {
         return this.inner().networkProfile();
@@ -126,6 +166,16 @@ public StorageProfile storageProfile() {
         return this.inner().storageProfile();
     }
 
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
     @Override
     public String vmId() {
         return this.inner().vmId();
@@ -136,6 +186,18 @@ public List<String> zones() {
         return this.inner().zones();
     }
 
+    @Override
+    public VirtualMachineImpl withExistingLocation(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    @Override
+    public VirtualMachineImpl withLocation(String location) {
+        this.inner().withLocation(location);
+        return this;
+    }
+
     @Override
     public VirtualMachineImpl withAvailabilitySet(SubResource availabilitySet) {
         this.inner().withAvailabilitySet(availabilitySet);
@@ -190,6 +252,12 @@ public VirtualMachineImpl withStorageProfile(StorageProfile storageProfile) {
         return this;
     }
 
+    @Override
+    public VirtualMachineImpl withTags(Map<String, String> tags) {
+        this.inner().withTags(tags);
+        return this;
+    }
+
     @Override
     public VirtualMachineImpl withZones(List<String> zones) {
         this.inner().withZones(zones);
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 711214be6202..95abc2e135c3 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
@@ -65,9 +65,8 @@ public class VirtualMachineInstanceViewInner {
 
     /**
      * 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,
+     * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You
+     * can easily view the output of your console log. &lt;br&gt;&lt;br&gt;
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -221,7 +220,7 @@ public VirtualMachineInstanceViewInner withExtensions(List<VirtualMachineExtensi
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -230,7 +229,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; 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.
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 e562231ccc11..18dee1e7ae20 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
@@ -65,9 +65,8 @@ public class VirtualMachineScaleSetVMInstanceViewInner {
 
     /**
      * 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,
+     * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You
+     * can easily view the output of your console log. &lt;br&gt;&lt;br&gt;
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -217,7 +216,7 @@ public VirtualMachineHealthStatus vmHealth() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -226,7 +225,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; 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.
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
index 67930ac13269..8f9c5a8f6ae4 100644
--- 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
@@ -4,27 +4,20 @@
  * license information.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
- * def
+ * abc
  */
 
 package com.microsoft.azure.management.compute.v2017_03_30.implementation;
 
-import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 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.VirtualMachine;
 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.VirtualMachineInstanceView;
 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;
@@ -32,65 +25,39 @@
 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);
-    }
+class VirtualMachinesImpl extends WrapperImpl<VirtualMachinesInner> implements VirtualMachines {
+    private final ComputeManager manager;
 
-    @Override
-    protected Observable<VirtualMachineInner> getInnerAsync(String resourceGroupName, String name) {
-        VirtualMachinesInner client = this.inner();
-        return client.getByResourceGroupAsync(resourceGroupName, name);
+    VirtualMachinesImpl(ComputeManager manager) {
+        super(manager.inner().virtualMachines());
+        this.manager = manager;
     }
 
-    @Override
-    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
-        VirtualMachinesInner client = this.inner();
-        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    public ComputeManager manager() {
+        return this.manager;
     }
 
     @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);
+    public VirtualMachineImpl defineVirtualMachine(String name) {
+        return wrapVirtualMachineModel(name);
     }
 
-    @Override
-    public Observable<String> deleteByIdsAsync(String...ids) {
-        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    private VirtualMachineImpl wrapVirtualMachineModel(String name) {
+        return new VirtualMachineImpl(name, this.manager());
     }
 
-    @Override
-    public void deleteByIds(Collection<String> ids) {
-        if (ids != null && !ids.isEmpty()) {
-            this.deleteByIdsAsync(ids).toBlocking().last();
-        }
+    private VirtualMachineImpl wrapVirtualMachineModel(VirtualMachineInner inner) {
+        return  new VirtualMachineImpl(inner, manager());
     }
 
-    @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));
+    private VirtualMachineVirtualMachineSizeImpl wrapVirtualMachineVirtualMachineSizeModel(VirtualMachineSizeInner inner) {
+        return  new VirtualMachineVirtualMachineSizeImpl(inner, manager());
     }
 
     @Override
-    public Observable<VirtualMachine> listByResourceGroupAsync(String resourceGroupName) {
+    public Observable<VirtualMachine> listByLocationAsync(final String location) {
         VirtualMachinesInner client = this.inner();
-        return client.listByResourceGroupAsync(resourceGroupName)
+        return client.listByLocationAsync(location)
         .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
             @Override
             public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
@@ -100,48 +67,43 @@ public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
         .map(new Func1<VirtualMachineInner, VirtualMachine>() {
             @Override
             public VirtualMachine call(VirtualMachineInner inner) {
-                return wrapModel(inner);
+                return wrapVirtualMachineModel(inner);
             }
         });
     }
 
     @Override
-    public PagedList<VirtualMachine> list() {
+    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
         VirtualMachinesInner client = this.inner();
-        return this.wrapList(client.list());
+        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<VirtualMachine> listAsync() {
+    public Observable<OperationStatusResponse> deleteAsync(String resourceGroupName, String vmName) {
         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>() {
+        return client.deleteAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
             @Override
-            public VirtualMachine call(VirtualMachineInner inner) {
-                return wrapModel(inner);
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public VirtualMachineImpl define(String name) {
-        return wrapModel(name);
-    }
-
-    @Override
-    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
+    public Observable<VirtualMachine> getByResourceGroupAsync(String resourceGroupName, String vmName) {
         VirtualMachinesInner client = this.inner();
-        return client.captureAsync(resourceGroupName, vmName, parameters)
-        .map(new Func1<VirtualMachineCaptureResultInner, VirtualMachineCaptureResult>() {
+        return client.getByResourceGroupAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
             @Override
-            public VirtualMachineCaptureResult call(VirtualMachineCaptureResultInner inner) {
-                return new VirtualMachineCaptureResultImpl(inner, manager());
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return new VirtualMachineImpl(inner, manager());
             }
         });
     }
@@ -267,17 +229,39 @@ public RunCommandResult call(RunCommandResultInner inner) {
     }
 
     @Override
-    protected VirtualMachineImpl wrapModel(VirtualMachineInner inner) {
-        return  new VirtualMachineImpl(inner.name(), inner, manager());
+    public Observable<VirtualMachine> listByResourceGroupAsync(final 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 new VirtualMachineImpl(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());
+    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 new VirtualMachineImpl(inner, manager());
+            }
+        });
     }
 
     @Override
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 71036e8f6c72..ba49e614f76f 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
@@ -72,6 +72,10 @@ interface VirtualMachinesService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions")
         Observable<Response<ResponseBody>> getExtensions(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Query("$expand") String expand, @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.VirtualMachines listByLocation" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/virtualMachines")
+        Observable<Response<ResponseBody>> listByLocation(@Path("location") String location, @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.VirtualMachines capture" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture")
         Observable<Response<ResponseBody>> capture(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Body VirtualMachineCaptureParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -184,6 +188,10 @@ interface VirtualMachinesService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand")
         Observable<Response<ResponseBody>> beginRunCommand(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Body RunCommandInput 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.compute.v2017_03_30.VirtualMachines listByLocationNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByLocationNext(@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.VirtualMachines listByResourceGroupNext" })
         @GET
         Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -364,6 +372,121 @@ private ServiceResponse<VirtualMachineExtensionsListResultInner> getExtensionsDe
                 .build(response);
     }
 
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @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;VirtualMachineInner&gt; object if successful.
+     */
+    public PagedList<VirtualMachineInner> listByLocation(final String location) {
+        ServiceResponse<Page<VirtualMachineInner>> response = listByLocationSinglePageAsync(location).toBlocking().single();
+        return new PagedList<VirtualMachineInner>(response.body()) {
+            @Override
+            public Page<VirtualMachineInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @param serviceCallback 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<VirtualMachineInner>> listByLocationAsync(final String location, final ListOperationCallback<VirtualMachineInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualMachineInner&gt; object
+     */
+    public Observable<Page<VirtualMachineInner>> listByLocationAsync(final String location) {
+        return listByLocationWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Page<VirtualMachineInner>>() {
+                @Override
+                public Page<VirtualMachineInner> call(ServiceResponse<Page<VirtualMachineInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualMachineInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationWithServiceResponseAsync(final String location) {
+        return listByLocationSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceResponse<Page<VirtualMachineInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+    ServiceResponse<PageImpl<VirtualMachineInner>> * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualMachineInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location 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.listByLocation(location, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listByLocationDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listByLocationDelegate(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);
+    }
+
     /**
      * Captures the VM by copying virtual hard disks of the VM and outputs a template that can be used to create similar VMs.
      *
@@ -2784,6 +2907,117 @@ private ServiceResponse<RunCommandResultInner> beginRunCommandDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object if successful.
+     */
+    public PagedList<VirtualMachineInner> listByLocationNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualMachineInner>> response = listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualMachineInner>(response.body()) {
+            @Override
+            public Page<VirtualMachineInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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<VirtualMachineInner>> listByLocationNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualMachineInner>> serviceFuture, final ListOperationCallback<VirtualMachineInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object
+     */
+    public Observable<Page<VirtualMachineInner>> listByLocationNextAsync(final String nextPageLink) {
+        return listByLocationNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Page<VirtualMachineInner>>() {
+                @Override
+                public Page<VirtualMachineInner> call(ServiceResponse<Page<VirtualMachineInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByLocationNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceResponse<Page<VirtualMachineInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+    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.
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationNextSinglePageAsync(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.listByLocationNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl<VirtualMachineInner>> result = listByLocationNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl<VirtualMachineInner>> listByLocationNextDelegate(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);
+    }
+
     /**
      * 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.
      *
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 abde4fb15a84..5c512f30c003 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
@@ -12,9 +12,8 @@
 
 /**
  * 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
+ * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You can
+ * easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also
  * enables you to see a screenshot of the VM from the hypervisor.
  */
 public class BootDiagnostics {
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 038592758e98..c3c1c511e5e5 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
@@ -17,13 +17,13 @@ public class BootDiagnosticsInstanceView {
     /**
      * The console screenshot blob URI.
      */
-    @JsonProperty(value = "consoleScreenshotBlobUri")
+    @JsonProperty(value = "consoleScreenshotBlobUri", access = JsonProperty.Access.WRITE_ONLY)
     private String consoleScreenshotBlobUri;
 
     /**
      * The Linux serial console log blob Uri.
      */
-    @JsonProperty(value = "serialConsoleLogBlobUri")
+    @JsonProperty(value = "serialConsoleLogBlobUri", access = JsonProperty.Access.WRITE_ONLY)
     private String serialConsoleLogBlobUri;
 
     /**
@@ -35,17 +35,6 @@ public String consoleScreenshotBlobUri() {
         return this.consoleScreenshotBlobUri;
     }
 
-    /**
-     * Set the console screenshot blob URI.
-     *
-     * @param consoleScreenshotBlobUri the consoleScreenshotBlobUri value to set
-     * @return the BootDiagnosticsInstanceView object itself.
-     */
-    public BootDiagnosticsInstanceView withConsoleScreenshotBlobUri(String consoleScreenshotBlobUri) {
-        this.consoleScreenshotBlobUri = consoleScreenshotBlobUri;
-        return this;
-    }
-
     /**
      * Get the Linux serial console log blob Uri.
      *
@@ -55,15 +44,4 @@ public String serialConsoleLogBlobUri() {
         return this.serialConsoleLogBlobUri;
     }
 
-    /**
-     * Set the Linux serial console log blob Uri.
-     *
-     * @param serialConsoleLogBlobUri the serialConsoleLogBlobUri value to set
-     * @return the BootDiagnosticsInstanceView object itself.
-     */
-    public BootDiagnosticsInstanceView withSerialConsoleLogBlobUri(String serialConsoleLogBlobUri) {
-        this.serialConsoleLogBlobUri = serialConsoleLogBlobUri;
-        return this;
-    }
-
 }
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 9bdc138e1abc..f306a7c86ba8 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
@@ -17,9 +17,8 @@
 public class DiagnosticsProfile {
     /**
      * 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,
+     * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You
+     * can easily view the output of your console log. &lt;br&gt;&lt;br&gt;
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -27,7 +26,7 @@ public class DiagnosticsProfile {
     private BootDiagnostics bootDiagnostics;
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -36,7 +35,7 @@ public BootDiagnostics bootDiagnostics() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; 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/VirtualMachine.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachine.java
index 259954b05cfa..634661bc5381 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
@@ -9,24 +9,22 @@
 package com.microsoft.azure.management.compute.v2017_12_01;
 
 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.management.compute.v2017_12_01.implementation.VirtualMachineInner;
+import com.microsoft.azure.arm.model.Indexable;
 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.compute.v2017_12_01.implementation.ComputeManager;
+import java.util.Map;
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInstanceViewInner;
 import java.util.List;
-import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineInner;
 
 /**
  * Type representing VirtualMachine.
  */
-public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource, GroupableResourceCore<ComputeManager, VirtualMachineInner>, HasResourceGroup, Refreshable<VirtualMachine>, Updatable<VirtualMachine.Update>, HasManager<ComputeManager> {
+public interface VirtualMachine extends HasInner<VirtualMachineInner>, Indexable, Updatable<VirtualMachine.Update>, HasManager<ComputeManager> {
     /**
      * @return the availabilitySet value.
      */
@@ -42,6 +40,11 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     HardwareProfile hardwareProfile();
 
+    /**
+     * @return the id value.
+     */
+    String id();
+
     /**
      * @return the identity value.
      */
@@ -57,6 +60,16 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     String licenseType();
 
+    /**
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
     /**
      * @return the networkProfile value.
      */
@@ -87,6 +100,16 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
      */
     StorageProfile storageProfile();
 
+    /**
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
     /**
      * @return the vmId value.
      */
@@ -100,7 +123,7 @@ public interface VirtualMachine extends HasInner<VirtualMachineInner>, Resource,
     /**
      * The entirety of the VirtualMachine definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
     }
 
     /**
@@ -110,17 +133,31 @@ interface DefinitionStages {
         /**
          * The first stage of a VirtualMachine definition.
          */
-        interface Blank extends GroupableResourceCore.DefinitionWithRegion<WithGroup> {
+        interface Blank extends WithLocation {
         }
 
         /**
-         * The stage of the VirtualMachine definition allowing to specify the resource group.
+         * The stage of the virtualmachine definition allowing to specify Location.
          */
-        interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<WithCreate> {
+        interface WithLocation {
+           /**
+            * Specifies resourceGroupName.
+            */
+            WithLocation withExistingLocation(String resourceGroupName);
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify AvailabilitySet.
+         * The stage of the virtualmachine definition allowing to specify Location.
+         */
+        interface WithLocation {
+           /**
+            * Specifies location.
+            */
+            WithCreate withLocation(String location);
+        }
+
+        /**
+         * The stage of the virtualmachine definition allowing to specify AvailabilitySet.
          */
         interface WithAvailabilitySet {
             /**
@@ -130,7 +167,7 @@ interface WithAvailabilitySet {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify DiagnosticsProfile.
+         * The stage of the virtualmachine definition allowing to specify DiagnosticsProfile.
          */
         interface WithDiagnosticsProfile {
             /**
@@ -140,7 +177,7 @@ interface WithDiagnosticsProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify HardwareProfile.
+         * The stage of the virtualmachine definition allowing to specify HardwareProfile.
          */
         interface WithHardwareProfile {
             /**
@@ -150,7 +187,7 @@ interface WithHardwareProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Identity.
+         * The stage of the virtualmachine definition allowing to specify Identity.
          */
         interface WithIdentity {
             /**
@@ -160,7 +197,7 @@ interface WithIdentity {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify LicenseType.
+         * The stage of the virtualmachine definition allowing to specify LicenseType.
          */
         interface WithLicenseType {
             /**
@@ -170,7 +207,7 @@ interface WithLicenseType {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify NetworkProfile.
+         * The stage of the virtualmachine definition allowing to specify NetworkProfile.
          */
         interface WithNetworkProfile {
             /**
@@ -180,7 +217,7 @@ interface WithNetworkProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify OsProfile.
+         * The stage of the virtualmachine definition allowing to specify OsProfile.
          */
         interface WithOsProfile {
             /**
@@ -190,7 +227,7 @@ interface WithOsProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Plan.
+         * The stage of the virtualmachine definition allowing to specify Plan.
          */
         interface WithPlan {
             /**
@@ -200,7 +237,7 @@ interface WithPlan {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify StorageProfile.
+         * The stage of the virtualmachine definition allowing to specify StorageProfile.
          */
         interface WithStorageProfile {
             /**
@@ -210,7 +247,17 @@ interface WithStorageProfile {
         }
 
         /**
-         * The stage of the virtualmachine update allowing to specify Zones.
+         * The stage of the virtualmachine definition allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the virtualmachine definition allowing to specify Zones.
          */
         interface WithZones {
             /**
@@ -224,13 +271,13 @@ interface WithZones {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<VirtualMachine>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAvailabilitySet, DefinitionStages.WithDiagnosticsProfile, DefinitionStages.WithHardwareProfile, DefinitionStages.WithIdentity, DefinitionStages.WithLicenseType, DefinitionStages.WithNetworkProfile, DefinitionStages.WithOsProfile, DefinitionStages.WithPlan, DefinitionStages.WithStorageProfile, DefinitionStages.WithZones {
+        interface WithCreate extends Creatable<VirtualMachine>, DefinitionStages.WithAvailabilitySet, DefinitionStages.WithDiagnosticsProfile, DefinitionStages.WithHardwareProfile, DefinitionStages.WithIdentity, DefinitionStages.WithLicenseType, DefinitionStages.WithNetworkProfile, DefinitionStages.WithOsProfile, DefinitionStages.WithPlan, DefinitionStages.WithStorageProfile, DefinitionStages.WithTags, DefinitionStages.WithZones {
         }
     }
     /**
      * The template for a VirtualMachine update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<VirtualMachine>, Resource.UpdateWithTags<Update>, UpdateStages.WithAvailabilitySet, UpdateStages.WithDiagnosticsProfile, UpdateStages.WithHardwareProfile, UpdateStages.WithIdentity, UpdateStages.WithLicenseType, UpdateStages.WithNetworkProfile, UpdateStages.WithOsProfile, UpdateStages.WithPlan, UpdateStages.WithStorageProfile, UpdateStages.WithZones {
+    interface Update extends Appliable<VirtualMachine>, UpdateStages.WithAvailabilitySet, UpdateStages.WithDiagnosticsProfile, UpdateStages.WithHardwareProfile, UpdateStages.WithIdentity, UpdateStages.WithLicenseType, UpdateStages.WithNetworkProfile, UpdateStages.WithOsProfile, UpdateStages.WithPlan, UpdateStages.WithStorageProfile, UpdateStages.WithTags, UpdateStages.WithZones {
     }
 
     /**
@@ -238,7 +285,7 @@ interface Update extends Appliable<VirtualMachine>, Resource.UpdateWithTags<Upda
      */
     interface UpdateStages {
         /**
-         * The stage of the virtualmachine {0} allowing to specify AvailabilitySet.
+         * The stage of the virtualmachine update allowing to specify AvailabilitySet.
          */
         interface WithAvailabilitySet {
             /**
@@ -248,7 +295,7 @@ interface WithAvailabilitySet {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify DiagnosticsProfile.
+         * The stage of the virtualmachine update allowing to specify DiagnosticsProfile.
          */
         interface WithDiagnosticsProfile {
             /**
@@ -258,7 +305,7 @@ interface WithDiagnosticsProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify HardwareProfile.
+         * The stage of the virtualmachine update allowing to specify HardwareProfile.
          */
         interface WithHardwareProfile {
             /**
@@ -268,7 +315,7 @@ interface WithHardwareProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Identity.
+         * The stage of the virtualmachine update allowing to specify Identity.
          */
         interface WithIdentity {
             /**
@@ -278,7 +325,7 @@ interface WithIdentity {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify LicenseType.
+         * The stage of the virtualmachine update allowing to specify LicenseType.
          */
         interface WithLicenseType {
             /**
@@ -288,7 +335,7 @@ interface WithLicenseType {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify NetworkProfile.
+         * The stage of the virtualmachine update allowing to specify NetworkProfile.
          */
         interface WithNetworkProfile {
             /**
@@ -298,7 +345,7 @@ interface WithNetworkProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify OsProfile.
+         * The stage of the virtualmachine update allowing to specify OsProfile.
          */
         interface WithOsProfile {
             /**
@@ -308,7 +355,7 @@ interface WithOsProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Plan.
+         * The stage of the virtualmachine update allowing to specify Plan.
          */
         interface WithPlan {
             /**
@@ -318,7 +365,7 @@ interface WithPlan {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify StorageProfile.
+         * The stage of the virtualmachine update allowing to specify StorageProfile.
          */
         interface WithStorageProfile {
             /**
@@ -328,7 +375,17 @@ interface WithStorageProfile {
         }
 
         /**
-         * The stage of the virtualmachine {0} allowing to specify Zones.
+         * The stage of the virtualmachine update allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the virtualmachine update allowing to specify Zones.
          */
         interface WithZones {
             /**
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensions.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensions.java
index 11df68b64868..18bb37df8f29 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensions.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachineExtensions.java
@@ -8,16 +8,20 @@
 
 package com.microsoft.azure.management.compute.v2017_12_01;
 
-import com.microsoft.azure.arm.collection.SupportsCreating;
-import rx.Completable;
 import rx.Observable;
-import com.microsoft.azure.management.compute.v2017_12_01.implementation.VirtualMachineExtensionsInner;
-import com.microsoft.azure.arm.model.HasInner;
+import rx.Completable;
 
 /**
  * Type representing VirtualMachineExtensions.
  */
-public interface VirtualMachineExtensions extends SupportsCreating<VirtualMachineExtension.DefinitionStages.Blank>, HasInner<VirtualMachineExtensionsInner> {
+public interface VirtualMachineExtensions {
+    /**
+     * Begins definition for a new Extension resource.
+     * @param name resource name.
+     * @return the first stage of the new Extension definition.
+     */
+    VirtualMachineExtension.DefinitionStages.Blank defineExtension(String name);
+
     /**
      * The operation to get the extension.
      *
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachines.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachines.java
index 19735474f5b3..700e08c6f254 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachines.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/VirtualMachines.java
@@ -8,21 +8,31 @@
 
 package com.microsoft.azure.management.compute.v2017_12_01;
 
-import com.microsoft.azure.arm.collection.SupportsCreating;
-import com.microsoft.azure.arm.resources.collection.SupportsDeletingByResourceGroup;
-import com.microsoft.azure.arm.resources.collection.SupportsBatchDeletion;
-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.VirtualMachinesInner;
-import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachine;
+import rx.Completable;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineVirtualMachineSize;
 
 /**
  * Type representing VirtualMachines.
  */
-public interface VirtualMachines extends SupportsCreating<VirtualMachine.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<VirtualMachine>, SupportsListingByResourceGroup<VirtualMachine>, SupportsListing<VirtualMachine>, HasInner<VirtualMachinesInner> {
+public interface VirtualMachines {
+    /**
+     * Begins definition for a new VirtualMachine resource.
+     * @param name resource name.
+     * @return the first stage of the new VirtualMachine definition.
+     */
+    VirtualMachine.DefinitionStages.Blank defineVirtualMachine(String name);
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listByLocationAsync(final String location);
+
     /**
      * Captures the VM by copying virtual hard disks of the VM and outputs a template that can be used to create similar VMs.
      *
@@ -34,6 +44,26 @@ public interface VirtualMachines extends SupportsCreating<VirtualMachine.Definit
      */
     Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters);
 
+    /**
+     * The operation to delete a virtual machine.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param vmName The name of the virtual machine.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<OperationStatusResponse> deleteAsync(String resourceGroupName, String vmName);
+
+    /**
+     * Retrieves information about the model view or the instance view of a virtual machine.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param vmName The name of the virtual machine.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> getByResourceGroupAsync(String resourceGroupName, String vmName);
+
     /**
      * Retrieves information about the run-time state of a virtual machine.
      *
@@ -135,6 +165,23 @@ public interface VirtualMachines extends SupportsCreating<VirtualMachine.Definit
      */
     Observable<RunCommandResult> runCommandAsync(String resourceGroupName, String vmName, RunCommandInput parameters);
 
+    /**
+     * 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.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listByResourceGroupAsync(final String resourceGroupName);
+
+    /**
+     * 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.
+     *
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<VirtualMachine> listAsync();
+
     /**
      * The operation to get all extensions of a Virtual Machine.
      *
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsImpl.java
index f0ff02f0132b..74a81c2fe4d0 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineExtensionsImpl.java
@@ -4,17 +4,17 @@
  * license information.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
- *
+ * abc
  */
 
 package com.microsoft.azure.management.compute.v2017_12_01.implementation;
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtensions;
-import rx.Completable;
 import rx.Observable;
 import rx.functions.Func1;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
+import rx.Completable;
 
 class VirtualMachineExtensionsImpl extends WrapperImpl<VirtualMachineExtensionsInner> implements VirtualMachineExtensions {
     private final ComputeManager manager;
@@ -29,16 +29,24 @@ public ComputeManager manager() {
     }
 
     @Override
-    public VirtualMachineExtensionImpl define(String name) {
-        return wrapModel(name);
+    public VirtualMachineExtensionImpl defineExtension(String name) {
+        return wrapExtensionModel(name);
+    }
+
+    private VirtualMachineExtensionImpl wrapExtensionModel(String name) {
+        return new VirtualMachineExtensionImpl(name, this.manager());
     }
 
-    private VirtualMachineExtensionImpl wrapModel(VirtualMachineExtensionInner inner) {
+    private VirtualMachineExtensionImpl wrapVirtualMachineExtensionModel(VirtualMachineExtensionInner inner) {
         return  new VirtualMachineExtensionImpl(inner, manager());
     }
 
-    private VirtualMachineExtensionImpl wrapModel(String name) {
-        return new VirtualMachineExtensionImpl(name, this.manager());
+    private Observable<VirtualMachineExtensionInner> getVirtualMachineExtensionInnerUsingVirtualMachineExtensionsInnerAsync(String id) {
+        String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
+        String vmName = IdParsingUtils.getValueFromIdByName(id, "virtualMachines");
+        String vmExtensionName = IdParsingUtils.getValueFromIdByName(id, "extensions");
+        VirtualMachineExtensionsInner client = this.inner();
+        return client.getAsync(resourceGroupName, vmName, vmExtensionName);
     }
 
     @Override
@@ -48,7 +56,7 @@ public Observable<VirtualMachineExtension> getAsync(String resourceGroupName, St
         .map(new Func1<VirtualMachineExtensionInner, VirtualMachineExtension>() {
             @Override
             public VirtualMachineExtension call(VirtualMachineExtensionInner inner) {
-                return wrapModel(inner);
+                return wrapVirtualMachineExtensionModel(inner);
             }
        });
     }
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
index ed1c149f6270..5046549d571d 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachineImpl.java
@@ -8,10 +8,11 @@
 
 package com.microsoft.azure.management.compute.v2017_12_01.implementation;
 
-import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachine;
+import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineUpdate;
+import java.util.Map;
 import com.microsoft.azure.SubResource;
 import java.util.List;
 import com.microsoft.azure.management.compute.v2017_12_01.Plan;
@@ -26,17 +27,42 @@
 import com.microsoft.azure.management.compute.v2017_12_01.VirtualMachineExtension;
 import rx.functions.Func1;
 
-class VirtualMachineImpl extends GroupableResourceCoreImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl, ComputeManager> implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update {
+class VirtualMachineImpl extends CreatableUpdatableImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl> implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update {
+    private final ComputeManager manager;
+    private String resourceGroupName;
+    private String vmName;
     private VirtualMachineUpdate updateParameter;
-    VirtualMachineImpl(String name, VirtualMachineInner inner, ComputeManager manager) {
-        super(name, inner, manager);
+
+    VirtualMachineImpl(String name, ComputeManager manager) {
+        super(name, new VirtualMachineInner());
+        this.manager = manager;
+        // Set resource name
+        this.vmName = name;
+        //
         this.updateParameter = new VirtualMachineUpdate();
     }
 
+    VirtualMachineImpl(VirtualMachineInner inner, ComputeManager manager) {
+        super(inner.name(), inner);
+        this.manager = manager;
+        // Set resource name
+        this.vmName = inner.name();
+        // resource ancestor names
+        this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
+        this.vmName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachines");
+        //
+        this.updateParameter = new VirtualMachineUpdate();
+    }
+
+    @Override
+    public ComputeManager manager() {
+        return this.manager;
+    }
+
     @Override
     public Observable<VirtualMachine> createResourceAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner())
+        return client.createOrUpdateAsync(this.resourceGroupName, this.vmName, this.inner())
             .map(new Func1<VirtualMachineInner, VirtualMachineInner>() {
                @Override
                public VirtualMachineInner call(VirtualMachineInner resource) {
@@ -50,7 +76,7 @@ public VirtualMachineInner call(VirtualMachineInner resource) {
     @Override
     public Observable<VirtualMachine> updateResourceAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.updateAsync(this.resourceGroupName(), this.name(), this.updateParameter)
+        return client.updateAsync(this.resourceGroupName, this.vmName, this.updateParameter)
             .map(new Func1<VirtualMachineInner, VirtualMachineInner>() {
                @Override
                public VirtualMachineInner call(VirtualMachineInner resource) {
@@ -64,7 +90,7 @@ public VirtualMachineInner call(VirtualMachineInner resource) {
     @Override
     protected Observable<VirtualMachineInner> getInnerAsync() {
         VirtualMachinesInner client = this.manager().inner().virtualMachines();
-        return client.getByResourceGroupAsync(this.resourceGroupName(), this.name());
+        return null; // NOP getInnerAsync implementation as get is not supported
     }
 
     @Override
@@ -91,6 +117,11 @@ public HardwareProfile hardwareProfile() {
         return this.inner().hardwareProfile();
     }
 
+    @Override
+    public String id() {
+        return this.inner().id();
+    }
+
     @Override
     public VirtualMachineIdentity identity() {
         return this.inner().identity();
@@ -111,6 +142,16 @@ public String licenseType() {
         return this.inner().licenseType();
     }
 
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
+    @Override
+    public String name() {
+        return this.inner().name();
+    }
+
     @Override
     public NetworkProfile networkProfile() {
         return this.inner().networkProfile();
@@ -147,6 +188,16 @@ public StorageProfile storageProfile() {
         return this.inner().storageProfile();
     }
 
+    @Override
+    public Map<String, String> tags() {
+        return this.inner().getTags();
+    }
+
+    @Override
+    public String type() {
+        return this.inner().type();
+    }
+
     @Override
     public String vmId() {
         return this.inner().vmId();
@@ -157,6 +208,18 @@ public List<String> zones() {
         return this.inner().zones();
     }
 
+    @Override
+    public VirtualMachineImpl withExistingLocation(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    @Override
+    public VirtualMachineImpl withLocation(String location) {
+        this.inner().withLocation(location);
+        return this;
+    }
+
     @Override
     public VirtualMachineImpl withAvailabilitySet(SubResource availabilitySet) {
         if (isInCreateMode()) {
@@ -247,6 +310,16 @@ public VirtualMachineImpl withStorageProfile(StorageProfile storageProfile) {
         return this;
     }
 
+    @Override
+    public VirtualMachineImpl withTags(Map<String, String> tags) {
+        if (isInCreateMode()) {
+            this.inner().withTags(tags);
+        } else {
+            this.updateParameter.withTags(tags);
+        }
+        return this;
+    }
+
     @Override
     public VirtualMachineImpl withZones(List<String> zones) {
         if (isInCreateMode()) {
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 02b18940d335..384370c1f449 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
@@ -83,9 +83,8 @@ public class VirtualMachineInstanceViewInner {
 
     /**
      * 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,
+     * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You
+     * can easily view the output of your console log. &lt;br&gt;&lt;br&gt;
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -299,7 +298,7 @@ public VirtualMachineInstanceViewInner withExtensions(List<VirtualMachineExtensi
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -308,7 +307,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; 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.
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 dd787d10a611..7df32beff89b 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
@@ -72,9 +72,8 @@ public class VirtualMachineScaleSetVMInstanceViewInner {
 
     /**
      * 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,
+     * Output and Screenshot to diagnose VM status. &lt;br&gt;&lt;br&gt; You
+     * can easily view the output of your console log. &lt;br&gt;&lt;br&gt;
      * Azure also enables you to see a screenshot of the VM from the
      * hypervisor.
      */
@@ -244,7 +243,7 @@ public VirtualMachineHealthStatus vmHealth() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; Azure also enables you to see a screenshot of the VM from the hypervisor.
      *
      * @return the bootDiagnostics value
      */
@@ -253,7 +252,7 @@ public BootDiagnosticsInstanceView bootDiagnostics() {
     }
 
     /**
-     * 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.
+     * 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; You can easily view the output of your console log. &lt;br&gt;&lt;br&gt; 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.
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
index cbc250caa010..6474872196e4 100644
--- 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
@@ -4,27 +4,20 @@
  * license information.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
- * def
+ * abc
  */
 
 package com.microsoft.azure.management.compute.v2017_12_01.implementation;
 
-import com.microsoft.azure.arm.resources.collection.implementation.GroupableResourcesCoreImpl;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 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.VirtualMachine;
 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.VirtualMachineInstanceView;
 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;
@@ -32,65 +25,39 @@
 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);
-    }
+class VirtualMachinesImpl extends WrapperImpl<VirtualMachinesInner> implements VirtualMachines {
+    private final ComputeManager manager;
 
-    @Override
-    protected Observable<VirtualMachineInner> getInnerAsync(String resourceGroupName, String name) {
-        VirtualMachinesInner client = this.inner();
-        return client.getByResourceGroupAsync(resourceGroupName, name);
+    VirtualMachinesImpl(ComputeManager manager) {
+        super(manager.inner().virtualMachines());
+        this.manager = manager;
     }
 
-    @Override
-    protected Completable deleteInnerAsync(String resourceGroupName, String name) {
-        VirtualMachinesInner client = this.inner();
-        return client.deleteAsync(resourceGroupName, name).toCompletable();
+    public ComputeManager manager() {
+        return this.manager;
     }
 
     @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);
+    public VirtualMachineImpl defineVirtualMachine(String name) {
+        return wrapVirtualMachineModel(name);
     }
 
-    @Override
-    public Observable<String> deleteByIdsAsync(String...ids) {
-        return this.deleteByIdsAsync(new ArrayList<String>(Arrays.asList(ids)));
+    private VirtualMachineImpl wrapVirtualMachineModel(String name) {
+        return new VirtualMachineImpl(name, this.manager());
     }
 
-    @Override
-    public void deleteByIds(Collection<String> ids) {
-        if (ids != null && !ids.isEmpty()) {
-            this.deleteByIdsAsync(ids).toBlocking().last();
-        }
+    private VirtualMachineImpl wrapVirtualMachineModel(VirtualMachineInner inner) {
+        return  new VirtualMachineImpl(inner, manager());
     }
 
-    @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));
+    private VirtualMachineVirtualMachineSizeImpl wrapVirtualMachineVirtualMachineSizeModel(VirtualMachineSizeInner inner) {
+        return  new VirtualMachineVirtualMachineSizeImpl(inner, manager());
     }
 
     @Override
-    public Observable<VirtualMachine> listByResourceGroupAsync(String resourceGroupName) {
+    public Observable<VirtualMachine> listByLocationAsync(final String location) {
         VirtualMachinesInner client = this.inner();
-        return client.listByResourceGroupAsync(resourceGroupName)
+        return client.listByLocationAsync(location)
         .flatMapIterable(new Func1<Page<VirtualMachineInner>, Iterable<VirtualMachineInner>>() {
             @Override
             public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
@@ -100,48 +67,43 @@ public Iterable<VirtualMachineInner> call(Page<VirtualMachineInner> page) {
         .map(new Func1<VirtualMachineInner, VirtualMachine>() {
             @Override
             public VirtualMachine call(VirtualMachineInner inner) {
-                return wrapModel(inner);
+                return wrapVirtualMachineModel(inner);
             }
         });
     }
 
     @Override
-    public PagedList<VirtualMachine> list() {
+    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
         VirtualMachinesInner client = this.inner();
-        return this.wrapList(client.list());
+        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<VirtualMachine> listAsync() {
+    public Observable<OperationStatusResponse> deleteAsync(String resourceGroupName, String vmName) {
         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>() {
+        return client.deleteAsync(resourceGroupName, vmName)
+        .map(new Func1<OperationStatusResponseInner, OperationStatusResponse>() {
             @Override
-            public VirtualMachine call(VirtualMachineInner inner) {
-                return wrapModel(inner);
+            public OperationStatusResponse call(OperationStatusResponseInner inner) {
+                return new OperationStatusResponseImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public VirtualMachineImpl define(String name) {
-        return wrapModel(name);
-    }
-
-    @Override
-    public Observable<VirtualMachineCaptureResult> captureAsync(String resourceGroupName, String vmName, VirtualMachineCaptureParameters parameters) {
+    public Observable<VirtualMachine> getByResourceGroupAsync(String resourceGroupName, String vmName) {
         VirtualMachinesInner client = this.inner();
-        return client.captureAsync(resourceGroupName, vmName, parameters)
-        .map(new Func1<VirtualMachineCaptureResultInner, VirtualMachineCaptureResult>() {
+        return client.getByResourceGroupAsync(resourceGroupName, vmName)
+        .map(new Func1<VirtualMachineInner, VirtualMachine>() {
             @Override
-            public VirtualMachineCaptureResult call(VirtualMachineCaptureResultInner inner) {
-                return new VirtualMachineCaptureResultImpl(inner, manager());
+            public VirtualMachine call(VirtualMachineInner inner) {
+                return new VirtualMachineImpl(inner, manager());
             }
         });
     }
@@ -267,17 +229,39 @@ public RunCommandResult call(RunCommandResultInner inner) {
     }
 
     @Override
-    protected VirtualMachineImpl wrapModel(VirtualMachineInner inner) {
-        return  new VirtualMachineImpl(inner.name(), inner, manager());
+    public Observable<VirtualMachine> listByResourceGroupAsync(final 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 new VirtualMachineImpl(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());
+    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 new VirtualMachineImpl(inner, manager());
+            }
+        });
     }
 
     @Override
diff --git a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesInner.java b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesInner.java
index 68236ab662c2..e44e408479c8 100644
--- a/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesInner.java
+++ b/compute/resource-manager/v2017_12_01/src/main/java/com/microsoft/azure/management/compute/v2017_12_01/implementation/VirtualMachinesInner.java
@@ -74,6 +74,10 @@ interface VirtualMachinesService {
         @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions")
         Observable<Response<ResponseBody>> getExtensions(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Query("$expand") String expand, @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.VirtualMachines listByLocation" })
+        @GET("subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/virtualMachines")
+        Observable<Response<ResponseBody>> listByLocation(@Path("location") String location, @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.VirtualMachines capture" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture")
         Observable<Response<ResponseBody>> capture(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Body VirtualMachineCaptureParameters parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -194,6 +198,10 @@ interface VirtualMachinesService {
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand")
         Observable<Response<ResponseBody>> beginRunCommand(@Path("resourceGroupName") String resourceGroupName, @Path("vmName") String vmName, @Path("subscriptionId") String subscriptionId, @Body RunCommandInput 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.compute.v2017_12_01.VirtualMachines listByLocationNext" })
+        @GET
+        Observable<Response<ResponseBody>> listByLocationNext(@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.VirtualMachines listByResourceGroupNext" })
         @GET
         Observable<Response<ResponseBody>> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -374,6 +382,121 @@ private ServiceResponse<VirtualMachineExtensionsListResultInner> getExtensionsDe
                 .build(response);
     }
 
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @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;VirtualMachineInner&gt; object if successful.
+     */
+    public PagedList<VirtualMachineInner> listByLocation(final String location) {
+        ServiceResponse<Page<VirtualMachineInner>> response = listByLocationSinglePageAsync(location).toBlocking().single();
+        return new PagedList<VirtualMachineInner>(response.body()) {
+            @Override
+            public Page<VirtualMachineInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @param serviceCallback 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<VirtualMachineInner>> listByLocationAsync(final String location, final ListOperationCallback<VirtualMachineInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationSinglePageAsync(location),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualMachineInner&gt; object
+     */
+    public Observable<Page<VirtualMachineInner>> listByLocationAsync(final String location) {
+        return listByLocationWithServiceResponseAsync(location)
+            .map(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Page<VirtualMachineInner>>() {
+                @Override
+                public Page<VirtualMachineInner> call(ServiceResponse<Page<VirtualMachineInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;VirtualMachineInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationWithServiceResponseAsync(final String location) {
+        return listByLocationSinglePageAsync(location)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceResponse<Page<VirtualMachineInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+    ServiceResponse<PageImpl1<VirtualMachineInner>> * @param location The location for which virtual machines under the subscription are queried.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;VirtualMachineInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationSinglePageAsync(final String location) {
+        if (location == null) {
+            throw new IllegalArgumentException("Parameter location 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.listByLocation(location, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listByLocationDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<VirtualMachineInner>> listByLocationDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Captures the VM by copying virtual hard disks of the VM and outputs a template that can be used to create similar VMs.
      *
@@ -2966,6 +3089,117 @@ private ServiceResponse<RunCommandResultInner> beginRunCommandDelegate(Response<
                 .build(response);
     }
 
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object if successful.
+     */
+    public PagedList<VirtualMachineInner> listByLocationNext(final String nextPageLink) {
+        ServiceResponse<Page<VirtualMachineInner>> response = listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<VirtualMachineInner>(response.body()) {
+            @Override
+            public Page<VirtualMachineInner> nextPage(String nextPageLink) {
+                return listByLocationNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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<VirtualMachineInner>> listByLocationNextAsync(final String nextPageLink, final ServiceFuture<List<VirtualMachineInner>> serviceFuture, final ListOperationCallback<VirtualMachineInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listByLocationNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(String nextPageLink) {
+                    return listByLocationNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object
+     */
+    public Observable<Page<VirtualMachineInner>> listByLocationNextAsync(final String nextPageLink) {
+        return listByLocationNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Page<VirtualMachineInner>>() {
+                @Override
+                public Page<VirtualMachineInner> call(ServiceResponse<Page<VirtualMachineInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+     * @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;VirtualMachineInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationNextWithServiceResponseAsync(final String nextPageLink) {
+        return listByLocationNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<VirtualMachineInner>>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(ServiceResponse<Page<VirtualMachineInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listByLocationNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Gets all the virtual machines under the specified subscription for the specified location.
+     *
+    ServiceResponse<PageImpl1<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.
+     */
+    public Observable<ServiceResponse<Page<VirtualMachineInner>>> listByLocationNextSinglePageAsync(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.listByLocationNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<VirtualMachineInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<VirtualMachineInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<VirtualMachineInner>> result = listByLocationNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<VirtualMachineInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<VirtualMachineInner>> listByLocationNextDelegate(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())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * 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.
      *