diff --git a/azure-mgmt-graph-rbac/pom.xml b/azure-mgmt-graph-rbac/pom.xml
index 79f631eaca1d0..8b091da7312d7 100644
--- a/azure-mgmt-graph-rbac/pom.xml
+++ b/azure-mgmt-graph-rbac/pom.xml
@@ -134,7 +134,6 @@
           </compilerArguments>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 </project>
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
index c7ec7af4cd3ff..cbff51255dea8 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ActiveDirectoryGroup.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.implementation.ADGroupInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -13,6 +14,7 @@
 /**
  * An immutable client-side representation of an Azure AD group.
  */
+@LangDefinition
 public interface ActiveDirectoryGroup extends
         Wrapper<ADGroupInner> {
     /**
@@ -47,6 +49,7 @@ public interface ActiveDirectoryGroup extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
+    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithDisplayName,
@@ -57,6 +60,7 @@ interface Definition extends
     /**
      * Grouping of all the group definition stages.
      */
+    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the group definition.
@@ -103,12 +107,14 @@ interface WithCreate extends
     /**
      * Grouping of all the group update stages.
      */
+    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a group update operation, containing all the settings that can be modified.
      */
+    @LangDefinition(ContainerName = "~/ActiveDirectoryGroup.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
index c8844b3e9d0b1..b54155736e1fc 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.graphrbac;
 
 import com.microsoft.azure.CloudException;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
@@ -17,6 +18,7 @@
 /**
  * Entry point to AD group management API.
  */
+@LangDefinition(ContainerName = "~/")
 public interface Groups extends
         SupportsCreating<ActiveDirectoryGroup.DefinitionStages.Blank>,
         SupportsListing<ActiveDirectoryGroup>,
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
index 5d0a609ee0a0d..da38f832162a1 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipal.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.implementation.ServicePrincipalInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -15,6 +16,7 @@
 /**
  * An immutable client-side representation of an Azure AD service principal.
  */
+@LangDefinition
 public interface ServicePrincipal extends
         Wrapper<ServicePrincipalInner> {
     /**
@@ -49,6 +51,7 @@ public interface ServicePrincipal extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
+    @LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithCreate {
@@ -57,6 +60,7 @@ interface Definition extends
     /**
      * Grouping of all the service principal definition stages.
      */
+    @LangDefinition(ContainerName = "~/ServicePrincipal.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the service principal definition.
@@ -91,12 +95,14 @@ interface WithCreate extends
     /**
      * Grouping of all the service principal update stages.
      */
+    @LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a service principal update operation, containing all the settings that can be modified.
      */
+    @LangDefinition(ContainerName = "~/ServicePrincipal.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
index 8dd433fa34a1d..b6c68e2ca213c 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/ServicePrincipals.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
@@ -16,6 +17,7 @@
 /**
  * Entry point to service principal management API.
  */
+@LangDefinition(ContainerName = "~/")
 public interface ServicePrincipals extends
         SupportsCreating<ServicePrincipal.DefinitionStages.Blank>,
         SupportsListing<ServicePrincipal>,
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
index 45c0b50bf3f89..5eab2a4d85635 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/User.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.implementation.UserInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -13,6 +14,7 @@
 /**
  * An immutable client-side representation of an Azure AD user.
  */
+@LangDefinition
 public interface User extends
         Wrapper<UserInner> {
 
@@ -58,6 +60,7 @@ public interface User extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
+    @LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithDisplayName,
@@ -69,6 +72,7 @@ interface Definition extends
     /**
      * Grouping of all the user definition stages.
      */
+    @LangDefinition(ContainerName = "~/User.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the user definition.
@@ -151,12 +155,14 @@ interface WithCreate extends
     /**
      * Grouping of all the user update stages.
      */
+    @LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
     }
 
     /**
      * The template for a user update operation, containing all the settings that can be modified.
      */
+    @LangDefinition(ContainerName = "~/User.Update", ContainerFileName = "IUpdate")
     interface Update {
     }
 }
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
index 6697418f0b0c9..271190e425544 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Users.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
@@ -16,6 +17,7 @@
 /**
  * Entry point to AD user management API.
  */
+@LangDefinition(ContainerName = "~/")
 public interface Users extends
         SupportsCreating<User.DefinitionStages.Blank>,
         SupportsListing<User>,
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalImpl.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalImpl.java
index aa63d4fa2f9a4..90c2815e808a0 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalImpl.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalImpl.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
 import rx.Observable;
@@ -15,6 +16,7 @@
 /**
  * Implementation for ServicePrincipal and its parent interfaces.
  */
+@LangDefinition
 class ServicePrincipalImpl
         extends CreatableUpdatableImpl<ServicePrincipal, ServicePrincipalInner, ServicePrincipalImpl>
         implements
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java
index ede66beea7fb3..d92e41a9d7aca 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java
@@ -8,6 +8,7 @@
 
 import com.microsoft.azure.Page;
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.GraphErrorException;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.graphrbac.ServicePrincipals;
@@ -23,6 +24,7 @@
 /**
  * The implementation of ServicePrincipals and its parent interfaces.
  */
+@LangDefinition
 class ServicePrincipalsImpl
         extends CreatableWrappersImpl<
             ServicePrincipal,
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UserImpl.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UserImpl.java
index ba1c22281d589..4b79aba7c7d8d 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UserImpl.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UserImpl.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.graphrbac.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.PasswordProfile;
 import com.microsoft.azure.management.graphrbac.User;
 import com.microsoft.azure.management.resources.fluentcore.model.implementation.CreatableUpdatableImpl;
@@ -14,6 +15,7 @@
 /**
  * Implementation for User and its parent interfaces.
  */
+@LangDefinition
 class UserImpl
         extends CreatableUpdatableImpl<User, UserInner, UserImpl>
         implements
diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java
index 6487b0f191e87..274399557aedf 100644
--- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java
+++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.graphrbac.implementation;
 
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.User;
 import com.microsoft.azure.management.graphrbac.Users;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableWrappersImpl;
@@ -19,6 +20,7 @@
 /**
  * The implementation of Users and its parent interfaces.
  */
+@LangDefinition
 class UsersImpl
         extends CreatableWrappersImpl<
             User,
diff --git a/azure-mgmt-keyvault/pom.xml b/azure-mgmt-keyvault/pom.xml
index 30306a0d7a74a..1079f2622ab33 100644
--- a/azure-mgmt-keyvault/pom.xml
+++ b/azure-mgmt-keyvault/pom.xml
@@ -138,7 +138,6 @@
           </compilerArguments>
         </configuration>
       </plugin>
-
     </plugins>
   </build>
 </project>
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
index 17f2f9eacf81e..a387f01b56745 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.keyvault;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.ActiveDirectoryGroup;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.graphrbac.User;
@@ -20,6 +21,7 @@
 /**
  * An immutable client-side representation of a key vault access policy.
  */
+@LangDefinition()
 public interface AccessPolicy extends
         ChildResource<Vault>,
         Wrapper<AccessPolicyEntry> {
@@ -53,6 +55,7 @@ public interface AccessPolicy extends
      * The entirety of an access policy definition.
      * @param <ParentT> the return type of the final {@link Attachable#attach()}
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition")
     interface Definition<ParentT> extends
             DefinitionStages.Blank<ParentT>,
             DefinitionStages.WithAttach<ParentT> {
@@ -61,6 +64,7 @@ interface Definition<ParentT> extends
     /**
      * Grouping of access policy definition stages applicable as part of a key vault creation.
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of an access policy definition.
@@ -193,6 +197,7 @@ interface WithAttach<ParentT> extends
      * The entirety of an access policy definition as part of a key vault update.
      * @param <ParentT> the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()}
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition")
     interface UpdateDefinition<ParentT> extends
             UpdateDefinitionStages.Blank<ParentT>,
             UpdateDefinitionStages.WithAttach<ParentT> {
@@ -201,6 +206,7 @@ interface UpdateDefinition<ParentT> extends
     /**
      * Grouping of access policy definition stages applicable as part of a key vault update.
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true)
     interface UpdateDefinitionStages {
         /**
          * The first stage of an access policy definition.
@@ -332,6 +338,7 @@ interface WithAttach<ParentT> extends
     /**
      * Grouping of all the key vault update stages.
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
         /**
          * The access policy update stage allowing permissions to be added or removed.
@@ -434,6 +441,7 @@ interface WithPermissions {
     /**
      * The entirety of an access policy update as part of a key vault update.
      */
+    @LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate")
     interface Update extends
             UpdateStages.WithPermissions,
             Settable<Vault.Update> {
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
index eafee197a2603..4d0b0c058b6d8 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.keyvault;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.keyvault.implementation.VaultInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
@@ -19,6 +20,7 @@
 /**
  * An immutable client-side representation of an Azure Key Vault.
  */
+@LangDefinition
 public interface Vault extends
         GroupableResource,
         Refreshable<Vault>,
@@ -72,6 +74,7 @@ public interface Vault extends
     /**
      * Container interface for all the definitions that need to be implemented.
      */
+    @LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition")
     interface Definition extends
         DefinitionStages.Blank,
         DefinitionStages.WithGroup,
@@ -82,6 +85,7 @@ interface Definition extends
     /**
      * Grouping of all the key vault definition stages.
      */
+    @LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of the key vault definition.
@@ -199,6 +203,7 @@ interface WithCreate extends
     /**
      * Grouping of all the key vault update stages.
      */
+    @LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
         /**
          * A key vault update allowing access policies to be modified, attached, or removed.
@@ -287,6 +292,7 @@ interface WithConfigurations {
     /**
      * The template for a key vault update operation, containing all the settings that can be modified.
      */
+    @LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate")
     interface Update extends
             Appliable<Vault>,
             UpdateStages.WithAccessPolicy,
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
index adb45ae990864..02226fde90d15 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.keyvault;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
@@ -17,6 +18,7 @@
 /**
  * Entry point for key vaults management API.
  */
+@LangDefinition(ContainerName = "~/")
 public interface Vaults extends
         SupportsListing<Vault>,
         SupportsCreating<Vault.DefinitionStages.Blank>,
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/AccessPolicyImpl.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/AccessPolicyImpl.java
index 8d65a20890178..01d4bcaff790d 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/AccessPolicyImpl.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/AccessPolicyImpl.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.keyvault.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.ActiveDirectoryGroup;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.graphrbac.User;
@@ -25,6 +26,7 @@
 /**
  * Implementation for AccessPolicy and its parent interfaces.
  */
+@LangDefinition
 class AccessPolicyImpl
         extends ChildResourceImpl<
                 AccessPolicyEntry,
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultImpl.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultImpl.java
index d7efebaefd21e..b299e47527b86 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultImpl.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultImpl.java
@@ -6,6 +6,7 @@
 
 package com.microsoft.azure.management.keyvault.implementation;
 
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.ServicePrincipal;
 import com.microsoft.azure.management.graphrbac.User;
 import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
@@ -31,6 +32,7 @@
 /**
  * Implementation for Vault and its parent interfaces.
  */
+@LangDefinition
 class VaultImpl
         extends GroupableResourceImpl<
             Vault,
diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java
index 2bc06369a87f6..5eedf529c3771 100644
--- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java
+++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java
@@ -7,6 +7,7 @@
 package com.microsoft.azure.management.keyvault.implementation;
 
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.graphrbac.implementation.GraphRbacManager;
 import com.microsoft.azure.management.keyvault.SkuName;
 import com.microsoft.azure.management.keyvault.Vault;
@@ -20,6 +21,7 @@
 /**
  * The implementation of Vaults and its parent interfaces.
  */
+@LangDefinition
 class VaultsImpl
         extends GroupableResourcesImpl<
             Vault,