diff --git a/.gitignore b/.gitignore
index c1b8d498aac1..9acecf643d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,6 @@ Thumbs.db
 
 # reduced pom files should not be included
 dependency-reduced-pom.xml
+
+# the translation file should not be included
+translation.properties
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java
index caf64f2dd4e2..095ad248c0b0 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java
@@ -1,6 +1,7 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
@@ -9,7 +10,7 @@
  * <p>
  * Note: Azure virtual machine extension image is also referred as virtual machine extension handler.
  */
-@Fluent
+@LangDefinition() // No @Fluent, since methods -> Property conversion is what we needed
 public interface VirtualMachineExtensionImage extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**
@@ -70,5 +71,6 @@ public interface VirtualMachineExtensionImage extends
     /**
      * @return the virtual machine extension image version this image belongs to
      */
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
     VirtualMachineExtensionImageVersion version();
 }
\ No newline at end of file
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageType.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageType.java
index bcf13416a17c..fd7e51b90861 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageType.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageType.java
@@ -1,13 +1,14 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
 /**
  * An immutable client-side representation of an Azure virtual machine extension image type.
  */
-@Fluent
+@LangDefinition // No @Fluent, since methods -> Property conversion is what we needed
 public interface VirtualMachineExtensionImageType extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**
@@ -28,11 +29,13 @@ public interface VirtualMachineExtensionImageType extends
     /**
      * @return the publisher of this virtual machine extension image type
      */
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
     VirtualMachinePublisher publisher();
 
     /**
      * @return Virtual machine image extension versions available in this type
      */
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
     VirtualMachineExtensionImageVersions versions();
 }
 
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageTypes.java
index b56c5185132c..3e193142b52a 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageTypes.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageTypes.java
@@ -1,11 +1,11 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine image extension types.
  */
-@Fluent
+@LangDefinition
 public interface VirtualMachineExtensionImageTypes extends SupportsListing<VirtualMachineExtensionImageType> {
 }
\ No newline at end of file
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java
index b08462dc22f4..e459c2ee3db0 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java
@@ -1,13 +1,15 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
 /**
  * An immutable client-side representation of an Azure virtual machine extension image version.
  */
-@Fluent
+@LangDefinition  // No @Fluent, since methods -> Property conversion is what we needed
 public interface VirtualMachineExtensionImageVersion extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**
@@ -28,10 +30,12 @@ public interface VirtualMachineExtensionImageVersion extends
     /**
      * @return the virtual machine extension image type this version belongs to
      */
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
     VirtualMachineExtensionImageType type();
 
     /**
      * @return virtual machine extension image this version represents
      */
+    @Method
     VirtualMachineExtensionImage image();
 }
\ No newline at end of file
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersions.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersions.java
index 6973f7ae644d..bc0b0893af55 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersions.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersions.java
@@ -1,11 +1,11 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine image extension versions.
  */
-@Fluent
+@LangDefinition
 public interface VirtualMachineExtensionImageVersions extends SupportsListing<VirtualMachineExtensionImageVersion> {
 }
\ No newline at end of file
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImages.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImages.java
index 4dbe063656eb..c283f2115290 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImages.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImages.java
@@ -1,12 +1,12 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion;
 
 /**
  *  Entry point to virtual machine extension image management API.
  */
-@Fluent
+@LangDefinition
 public interface VirtualMachineExtensionImages extends SupportsListingByRegion<VirtualMachineExtensionImage> {
     /**
      * @return entry point to virtual machine extension image publishers
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
index c42373a31a63..b78bad77160b 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java
@@ -1,5 +1,7 @@
 package com.microsoft.azure.management.compute.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.compute.ComputeRoles;
 import com.microsoft.azure.management.compute.OperatingSystemTypes;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
@@ -9,6 +11,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImage}.
  */
+@LangDefinition
 class VirtualMachineExtensionImageImpl
         extends WrapperImpl<VirtualMachineExtensionImageInner>
         implements VirtualMachineExtensionImage {
@@ -70,6 +73,7 @@ public boolean supportsMultipleExtensions() {
     }
 
     @Override
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
     public VirtualMachineExtensionImageVersion version() {
         return this.version;
     }
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
index ad9f5bd43ff2..e17c9b875fbf 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypeImpl.java
@@ -1,5 +1,7 @@
 package com.microsoft.azure.management.compute.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersions;
 import com.microsoft.azure.management.compute.VirtualMachinePublisher;
@@ -8,6 +10,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImageType}.
  */
+@LangDefinition
 class VirtualMachineExtensionImageTypeImpl
         extends WrapperImpl<VirtualMachineExtensionImageInner>
         implements VirtualMachineExtensionImageType {
@@ -38,11 +41,13 @@ public String regionName() {
     }
 
     @Override
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit as Property
     public VirtualMachinePublisher publisher() {
         return this.publisher;
     }
 
     @Override
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
     public VirtualMachineExtensionImageVersions versions() {
         return new VirtualMachineExtensionImageVersionsImpl(this.client, this);
     }
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypesImpl.java
index 39e9aa7e32a7..b53990a741cb 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypesImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageTypesImpl.java
@@ -1,6 +1,7 @@
 package com.microsoft.azure.management.compute.implementation;
 
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageTypes;
 import com.microsoft.azure.management.compute.VirtualMachinePublisher;
@@ -9,6 +10,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImageTypes}.
  */
+@LangDefinition
 class VirtualMachineExtensionImageTypesImpl
         extends ReadableWrappersImpl<VirtualMachineExtensionImageType, VirtualMachineExtensionImageTypeImpl, VirtualMachineExtensionImageInner>
         implements VirtualMachineExtensionImageTypes {
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
index f78b378e337d..92bedad80bbd 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionImpl.java
@@ -1,5 +1,8 @@
 package com.microsoft.azure.management.compute.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
+import com.microsoft.azure.management.apigeneration.Method;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
@@ -8,6 +11,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImageVersion}.
  */
+@LangDefinition
 class VirtualMachineExtensionImageVersionImpl
         extends WrapperImpl<VirtualMachineExtensionImageInner>
         implements VirtualMachineExtensionImageVersion {
@@ -38,11 +42,13 @@ public String regionName() {
     }
 
     @Override
+    @LangMethodDefinition(AsType =  LangMethodDefinition.LangMethodType.Property) // By default emitted as method adding this to emit Property
     public VirtualMachineExtensionImageType type() {
         return this.type;
     }
 
     @Override
+    @Method
     public VirtualMachineExtensionImage image() {
         VirtualMachineExtensionImageInner inner = this.client.get(this.regionName(),
                 this.type().publisher().name(),
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionsImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionsImpl.java
index e8146c46de18..bb4b0e75ce3d 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionsImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageVersionsImpl.java
@@ -1,6 +1,7 @@
 package com.microsoft.azure.management.compute.implementation;
 
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersions;
@@ -9,6 +10,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImageVersions}.
  */
+@LangDefinition
 public class VirtualMachineExtensionImageVersionsImpl
         extends ReadableWrappersImpl<VirtualMachineExtensionImageVersion, VirtualMachineExtensionImageVersionImpl, VirtualMachineExtensionImageInner>
         implements VirtualMachineExtensionImageVersions {
diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java
index dea1c6b7b1d4..f74a2d3bb504 100644
--- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java
+++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImagesImpl.java
@@ -1,6 +1,7 @@
 package com.microsoft.azure.management.compute.implementation;
 
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImage;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageType;
 import com.microsoft.azure.management.compute.VirtualMachineExtensionImageVersion;
@@ -13,6 +14,7 @@
 /**
  * The implementation for {@link VirtualMachineExtensionImages}.
  */
+@LangDefinition
 class VirtualMachineExtensionImagesImpl
         implements VirtualMachineExtensionImages {
     private final VirtualMachinePublishers publishers;