diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java
index 52c178fd7be14..9812398cb540f 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java
@@ -72,6 +72,7 @@ public interface VirtualMachine extends
      * 
      * @return the virtual machine sizes
      */
+    @Method
     PagedList<VirtualMachineSize> availableSizes();
 
     /**
@@ -530,6 +531,7 @@ interface WithWindowsCreate extends WithCreate {
              *
              * @return the stage representing creatable Windows VM definition
              */
+            @Method
             WithWindowsCreate disableVmAgent();
 
             /**
@@ -537,6 +539,7 @@ interface WithWindowsCreate extends WithCreate {
              *
              * @return the stage representing creatable Windows VM definition
              */
+            @Method
             WithWindowsCreate disableAutoUpdate();
 
             /**
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java
index 6fafcda1646ca..8808a91e798a8 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java
@@ -270,35 +270,52 @@ interface UpdateDefinition<ParentT>  extends
      */
     interface UpdateStages {
         /**
-         * Specifies the new size in GB for data disk.
-         *
-         * @param sizeInGB the disk size in GB
-         * @return the next stage of data disk update
+         * The stage of the virtual machine data disk update allowing to set the disk size.
          */
-        Update withSizeInGB(Integer sizeInGB);
+        interface WithDiskSize {
+            /**
+             * Specifies the new size in GB for data disk.
+             *
+             * @param sizeInGB the disk size in GB
+             * @return the next stage of data disk update
+             */
+            Update withSizeInGB(Integer sizeInGB);
+        }
 
         /**
-         * Specifies the new logical unit number for the data disk.
-         *
-         * @param lun the logical unit number
-         * @return the next stage of data disk update
+         * The stage of the virtual machine data disk update allowing to set the disk lun.
          */
-        Update withLun(Integer lun);
+        interface WithDiskLun {
+            /**
+             * Specifies the new logical unit number for the data disk.
+             *
+             * @param lun the logical unit number
+             * @return the next stage of data disk update
+             */
+            Update withLun(Integer lun);
+        }
 
         /**
-         * Specifies the new caching type for the data disk.
-         *
-         * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-         * @return the next stage of data disk update
+         * The stage of the virtual machine data disk update allowing to set the disk caching type.
          */
-        Update withCaching(CachingTypes cachingType);
+        interface WithDiskCaching {
+            /**
+             * Specifies the new caching type for the data disk.
+             *
+             * @param cachingType the disk caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+             * @return the next stage of data disk update
+             */
+            Update withCaching(CachingTypes cachingType);
+        }
     }
 
     /**
      * The entirety of a data disk update as part of a virtual machine update.
      */
     interface Update extends
-            UpdateStages,
+            UpdateStages.WithDiskSize,
+            UpdateStages.WithDiskLun,
+            UpdateStages.WithDiskCaching,
             Settable<VirtualMachine.Update> {
     }
 }
\ No newline at end of file