diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
index 3a8572c21030..d2144d2e9485 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts
@@ -37,6 +37,9 @@ class ApiManagementClient extends ApiManagementClientContext {
   backend: operations.Backend;
   cache: operations.Cache;
   certificate: operations.Certificate;
+  contentType: operations.ContentType;
+  contentTypeContentItem: operations.ContentTypeContentItem;
+  deletedServices: operations.DeletedServices;
   apiManagementOperations: operations.ApiManagementOperations;
   apiManagementServiceSkus: operations.ApiManagementServiceSkus;
   apiManagementService: operations.ApiManagementService;
@@ -111,6 +114,9 @@ class ApiManagementClient extends ApiManagementClientContext {
     this.backend = new operations.Backend(this);
     this.cache = new operations.Cache(this);
     this.certificate = new operations.Certificate(this);
+    this.contentType = new operations.ContentType(this);
+    this.contentTypeContentItem = new operations.ContentTypeContentItem(this);
+    this.deletedServices = new operations.DeletedServices(this);
     this.apiManagementOperations = new operations.ApiManagementOperations(this);
     this.apiManagementServiceSkus = new operations.ApiManagementServiceSkus(this);
     this.apiManagementService = new operations.ApiManagementService(this);
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index a0b30c5faf24..c9e938236036 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -45,7 +45,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
 
     super(credentials, options);
 
-    this.apiVersion = '2019-12-01';
+    this.apiVersion = '2020-06-01-preview';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
index 10326b642115..1eef85aa9650 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
@@ -12,6 +12,7 @@ export {
   ApiDiagnosticCreateOrUpdateHeaders,
   ApiDiagnosticGetEntityTagHeaders,
   ApiDiagnosticGetHeaders,
+  ApiDiagnosticUpdateHeaders,
   ApiManagementServiceIdentity,
   ApiManagementServiceResource,
   ApiManagementServiceSkuProperties,
@@ -39,6 +40,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticCollection,
   DiagnosticContract,
   EmailTemplateContract,
@@ -56,6 +60,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
index bcf025c555ad..6f76504dceba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -56,6 +59,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
index 94550c31a779..bde239374da5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -56,6 +59,9 @@ export {
   IssueCommentCollection,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
index f7f41cb57c0b..cd7a71b91c9c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
@@ -12,6 +12,7 @@ export {
   ApiIssueCreateOrUpdateHeaders,
   ApiIssueGetEntityTagHeaders,
   ApiIssueGetHeaders,
+  ApiIssueUpdateHeaders,
   ApiManagementServiceIdentity,
   ApiManagementServiceResource,
   ApiManagementServiceSkuProperties,
@@ -39,6 +40,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +61,9 @@ export {
   IssueCommentContract,
   IssueContract,
   IssueUpdateContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
index 6a3825a39a8b..9aa44124e072 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
@@ -43,6 +43,9 @@ export {
   CertificateContract,
   CertificateInformation,
   CloudError,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -59,6 +62,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
index 55e0a2e7f17c..bbd48374149a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
@@ -25,6 +25,7 @@ export {
   ApiReleaseContract,
   ApiTagResourceContractProperties,
   ApiUpdateContract,
+  ApiUpdateHeaders,
   ApiVersionConstraint,
   ApiVersionSetContract,
   ApiVersionSetContractDetails,
@@ -46,6 +47,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -62,6 +66,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
index 9fea7c297f13..d9d297e4c995 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
@@ -17,6 +17,7 @@ export {
   ApiOperationCreateOrUpdateHeaders,
   ApiOperationGetEntityTagHeaders,
   ApiOperationGetHeaders,
+  ApiOperationUpdateHeaders,
   ApiReleaseContract,
   ApiVersionConstraint,
   ApiVersionSetContract,
@@ -39,6 +40,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +59,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
index d839005cf4d1..b3de0aba3854 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +58,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
index bd3f2e158024..087ed1f5f77e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +58,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
index 04e121e71a4e..6e9fe37a4451 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
index 3e5875867ed8..450366231ec2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
@@ -19,6 +19,7 @@ export {
   ApiReleaseCreateOrUpdateHeaders,
   ApiReleaseGetEntityTagHeaders,
   ApiReleaseGetHeaders,
+  ApiReleaseUpdateHeaders,
   ApiVersionConstraint,
   ApiVersionSetContract,
   ApiVersionSetContractDetails,
@@ -40,6 +41,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -56,6 +60,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
index 97c1c14738d4..8b5c267726b7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +58,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
index 95bcfc931452..77f225958710 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +58,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
index 1b1849674045..5eca5ff12e34 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
@@ -22,6 +22,7 @@ export {
   ApiVersionSetCreateOrUpdateHeaders,
   ApiVersionSetGetEntityTagHeaders,
   ApiVersionSetGetHeaders,
+  ApiVersionSetUpdateHeaders,
   ApiVersionSetUpdateParameters,
   AssociationContract,
   AuthenticationSettingsContract,
@@ -41,6 +42,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +61,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
index ff6bb419d095..2fab16f63f4e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
@@ -25,7 +25,10 @@ export {
   AuthorizationServerCreateOrUpdateHeaders,
   AuthorizationServerGetEntityTagHeaders,
   AuthorizationServerGetHeaders,
+  AuthorizationServerListSecretsHeaders,
+  AuthorizationServerSecretsContract,
   AuthorizationServerUpdateContract,
+  AuthorizationServerUpdateHeaders,
   BackendAuthorizationHeaderCredentials,
   BackendContract,
   BackendCredentialsContract,
@@ -40,7 +43,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
-  ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +62,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
index 96dc17f4f00d..5a71c1cc2cd0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
@@ -34,6 +34,7 @@ export {
   BackendReconnectContract,
   BackendServiceFabricClusterProperties,
   BackendTlsProperties,
+  BackendUpdateHeaders,
   BackendUpdateParameters,
   BaseResource,
   BodyDiagnosticSettings,
@@ -41,6 +42,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +61,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
index 925c1c8e995b..a42af22d67a6 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
@@ -37,10 +37,14 @@ export {
   CacheCreateOrUpdateHeaders,
   CacheGetEntityTagHeaders,
   CacheGetHeaders,
+  CacheUpdateHeaders,
   CacheUpdateParameters,
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +61,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
index dc1c4422c33d..93ec7da1f697 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
@@ -41,6 +41,9 @@ export {
   CertificateGetEntityTagHeaders,
   CertificateGetHeaders,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -57,6 +60,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/contentTypeContentItemMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/contentTypeContentItemMappers.ts
new file mode 100644
index 000000000000..6894192b8bd6
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/models/contentTypeContentItemMappers.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  AdditionalLocation,
+  ApiContract,
+  ApiManagementServiceIdentity,
+  ApiManagementServiceResource,
+  ApiManagementServiceSkuProperties,
+  ApiManagementServiceUpdateParameters,
+  ApimResource,
+  ApiReleaseContract,
+  ApiVersionConstraint,
+  ApiVersionSetContract,
+  ApiVersionSetContractDetails,
+  AssociationContract,
+  AuthenticationSettingsContract,
+  AuthorizationServerContract,
+  AuthorizationServerUpdateContract,
+  BackendAuthorizationHeaderCredentials,
+  BackendContract,
+  BackendCredentialsContract,
+  BackendProperties,
+  BackendProxyContract,
+  BackendReconnectContract,
+  BackendServiceFabricClusterProperties,
+  BackendTlsProperties,
+  BaseResource,
+  BodyDiagnosticSettings,
+  CacheContract,
+  CertificateConfiguration,
+  CertificateContract,
+  CertificateInformation,
+  ContentItemCollection,
+  ContentItemContract,
+  ContentTypeContentItemCreateOrUpdateHeaders,
+  ContentTypeContentItemGetEntityTagHeaders,
+  ContentTypeContentItemGetHeaders,
+  ContentTypeContract,
+  DeletedServiceContract,
+  DiagnosticContract,
+  EmailTemplateContract,
+  EmailTemplateParametersContractProperties,
+  ErrorFieldContract,
+  ErrorResponse,
+  GatewayContract,
+  GatewayHostnameConfigurationContract,
+  GroupContract,
+  GroupContractProperties,
+  HostnameConfiguration,
+  HttpMessageDiagnostic,
+  IdentityProviderContract,
+  IdentityProviderCreateContract,
+  IssueAttachmentContract,
+  IssueCommentContract,
+  IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
+  LoggerContract,
+  NamedValueContract,
+  NamedValueCreateContract,
+  NotificationContract,
+  OAuth2AuthenticationSettingsContract,
+  OpenIdAuthenticationSettingsContract,
+  OpenidConnectProviderContract,
+  OperationContract,
+  ParameterContract,
+  PipelineDiagnosticSettings,
+  PolicyContract,
+  PolicyDescriptionContract,
+  PortalDelegationSettings,
+  PortalSigninSettings,
+  PortalSignupSettings,
+  ProductContract,
+  RecipientEmailContract,
+  RecipientsContractProperties,
+  RecipientUserContract,
+  RegistrationDelegationSettingsProperties,
+  RepresentationContract,
+  RequestContract,
+  Resource,
+  ResourceLocationDataContract,
+  ResponseContract,
+  SamplingSettings,
+  SchemaContract,
+  SubscriptionContract,
+  SubscriptionKeyParameterNamesContract,
+  SubscriptionsDelegationSettingsProperties,
+  TagContract,
+  TagDescriptionContract,
+  TermsOfServiceProperties,
+  TokenBodyParameterContract,
+  UserContract,
+  UserIdentityContract,
+  UserIdentityProperties,
+  VirtualNetworkConfiguration,
+  X509CertificateName
+} from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/contentTypeMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/contentTypeMappers.ts
new file mode 100644
index 000000000000..bfd7fe64a1d7
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/models/contentTypeMappers.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  AdditionalLocation,
+  ApiContract,
+  ApiManagementServiceIdentity,
+  ApiManagementServiceResource,
+  ApiManagementServiceSkuProperties,
+  ApiManagementServiceUpdateParameters,
+  ApimResource,
+  ApiReleaseContract,
+  ApiVersionConstraint,
+  ApiVersionSetContract,
+  ApiVersionSetContractDetails,
+  AssociationContract,
+  AuthenticationSettingsContract,
+  AuthorizationServerContract,
+  AuthorizationServerUpdateContract,
+  BackendAuthorizationHeaderCredentials,
+  BackendContract,
+  BackendCredentialsContract,
+  BackendProperties,
+  BackendProxyContract,
+  BackendReconnectContract,
+  BackendServiceFabricClusterProperties,
+  BackendTlsProperties,
+  BaseResource,
+  BodyDiagnosticSettings,
+  CacheContract,
+  CertificateConfiguration,
+  CertificateContract,
+  CertificateInformation,
+  ContentItemContract,
+  ContentTypeCollection,
+  ContentTypeContract,
+  ContentTypeCreateOrUpdateHeaders,
+  ContentTypeGetHeaders,
+  DeletedServiceContract,
+  DiagnosticContract,
+  EmailTemplateContract,
+  EmailTemplateParametersContractProperties,
+  ErrorFieldContract,
+  ErrorResponse,
+  GatewayContract,
+  GatewayHostnameConfigurationContract,
+  GroupContract,
+  GroupContractProperties,
+  HostnameConfiguration,
+  HttpMessageDiagnostic,
+  IdentityProviderContract,
+  IdentityProviderCreateContract,
+  IssueAttachmentContract,
+  IssueCommentContract,
+  IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
+  LoggerContract,
+  NamedValueContract,
+  NamedValueCreateContract,
+  NotificationContract,
+  OAuth2AuthenticationSettingsContract,
+  OpenIdAuthenticationSettingsContract,
+  OpenidConnectProviderContract,
+  OperationContract,
+  ParameterContract,
+  PipelineDiagnosticSettings,
+  PolicyContract,
+  PolicyDescriptionContract,
+  PortalDelegationSettings,
+  PortalSigninSettings,
+  PortalSignupSettings,
+  ProductContract,
+  RecipientEmailContract,
+  RecipientsContractProperties,
+  RecipientUserContract,
+  RegistrationDelegationSettingsProperties,
+  RepresentationContract,
+  RequestContract,
+  Resource,
+  ResourceLocationDataContract,
+  ResponseContract,
+  SamplingSettings,
+  SchemaContract,
+  SubscriptionContract,
+  SubscriptionKeyParameterNamesContract,
+  SubscriptionsDelegationSettingsProperties,
+  TagContract,
+  TagDescriptionContract,
+  TermsOfServiceProperties,
+  TokenBodyParameterContract,
+  UserContract,
+  UserIdentityContract,
+  UserIdentityProperties,
+  VirtualNetworkConfiguration,
+  X509CertificateName
+} from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
index fec1853e62b2..6b039fe7e9fb 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
@@ -36,8 +36,11 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DelegationSettingsGetEntityTagHeaders,
   DelegationSettingsGetHeaders,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -54,6 +57,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/deletedServicesMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/deletedServicesMappers.ts
new file mode 100644
index 000000000000..61a3c836af45
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/models/deletedServicesMappers.ts
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export {
+  AdditionalLocation,
+  ApiContract,
+  ApiManagementServiceIdentity,
+  ApiManagementServiceResource,
+  ApiManagementServiceSkuProperties,
+  ApiManagementServiceUpdateParameters,
+  ApimResource,
+  ApiReleaseContract,
+  ApiVersionConstraint,
+  ApiVersionSetContract,
+  ApiVersionSetContractDetails,
+  AssociationContract,
+  AuthenticationSettingsContract,
+  AuthorizationServerContract,
+  AuthorizationServerUpdateContract,
+  BackendAuthorizationHeaderCredentials,
+  BackendContract,
+  BackendCredentialsContract,
+  BackendProperties,
+  BackendProxyContract,
+  BackendReconnectContract,
+  BackendServiceFabricClusterProperties,
+  BackendTlsProperties,
+  BaseResource,
+  BodyDiagnosticSettings,
+  CacheContract,
+  CertificateConfiguration,
+  CertificateContract,
+  CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
+  DeletedServicesCollection,
+  DiagnosticContract,
+  EmailTemplateContract,
+  EmailTemplateParametersContractProperties,
+  ErrorFieldContract,
+  ErrorResponse,
+  GatewayContract,
+  GatewayHostnameConfigurationContract,
+  GroupContract,
+  GroupContractProperties,
+  HostnameConfiguration,
+  HttpMessageDiagnostic,
+  IdentityProviderContract,
+  IdentityProviderCreateContract,
+  IssueAttachmentContract,
+  IssueCommentContract,
+  IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
+  LoggerContract,
+  NamedValueContract,
+  NamedValueCreateContract,
+  NotificationContract,
+  OAuth2AuthenticationSettingsContract,
+  OpenIdAuthenticationSettingsContract,
+  OpenidConnectProviderContract,
+  OperationContract,
+  ParameterContract,
+  PipelineDiagnosticSettings,
+  PolicyContract,
+  PolicyDescriptionContract,
+  PortalDelegationSettings,
+  PortalSigninSettings,
+  PortalSignupSettings,
+  ProductContract,
+  RecipientEmailContract,
+  RecipientsContractProperties,
+  RecipientUserContract,
+  RegistrationDelegationSettingsProperties,
+  RepresentationContract,
+  RequestContract,
+  Resource,
+  ResourceLocationDataContract,
+  ResponseContract,
+  SamplingSettings,
+  SchemaContract,
+  SubscriptionContract,
+  SubscriptionKeyParameterNamesContract,
+  SubscriptionsDelegationSettingsProperties,
+  TagContract,
+  TagDescriptionContract,
+  TermsOfServiceProperties,
+  TokenBodyParameterContract,
+  UserContract,
+  UserIdentityContract,
+  UserIdentityProperties,
+  VirtualNetworkConfiguration,
+  X509CertificateName
+} from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
index 1001dfb6804e..369d7a228495 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
@@ -36,11 +36,15 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticCollection,
   DiagnosticContract,
   DiagnosticCreateOrUpdateHeaders,
   DiagnosticGetEntityTagHeaders,
   DiagnosticGetHeaders,
+  DiagnosticUpdateHeaders,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
   ErrorFieldContract,
@@ -56,6 +60,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
index e95c43143839..2e0620354aa9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
@@ -36,12 +36,16 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateCollection,
   EmailTemplateContract,
   EmailTemplateGetEntityTagHeaders,
   EmailTemplateGetHeaders,
   EmailTemplateParametersContractProperties,
+  EmailTemplateUpdateHeaders,
   EmailTemplateUpdateParameters,
   ErrorFieldContract,
   ErrorResponse,
@@ -56,6 +60,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
index 3923b13a0f3c..550818a55f8d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
@@ -37,6 +37,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -54,6 +57,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
index 8a77fa12242c..ef33763ac4a4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -56,6 +59,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
index c1c140d0632a..b7f220a04c3c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,7 @@ export {
   GatewayListKeysHeaders,
   GatewayTokenContract,
   GatewayTokenRequestContract,
+  GatewayUpdateHeaders,
   GroupContract,
   GroupContractProperties,
   HostnameConfiguration,
@@ -61,6 +65,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
index cc5873a72832..f46c6f57b233 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -50,6 +53,7 @@ export {
   GroupCreateParameters,
   GroupGetEntityTagHeaders,
   GroupGetHeaders,
+  GroupUpdateHeaders,
   GroupUpdateParameters,
   HostnameConfiguration,
   HttpMessageDiagnostic,
@@ -58,6 +62,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
index 2eeab6b3baf7..7347a21f008a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
index 674b64208ffa..cfea8d0d24c7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
@@ -37,6 +37,9 @@ export {
   CertificateContract,
   CertificateInformation,
   ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -54,10 +57,15 @@ export {
   IdentityProviderGetEntityTagHeaders,
   IdentityProviderGetHeaders,
   IdentityProviderList,
+  IdentityProviderListSecretsHeaders,
+  IdentityProviderUpdateHeaders,
   IdentityProviderUpdateParameters,
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index 00a9ffa0200a..09d8c82df53e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -606,9 +606,9 @@ export interface IssueContractBaseProperties {
 }
 
 /**
- * Issue update Parameters.
+ * Issue Contract details.
  */
-export interface IssueUpdateContract {
+export interface IssueContract extends Resource {
   /**
    * Date and time when the issue was created.
    */
@@ -625,21 +625,21 @@ export interface IssueUpdateContract {
   /**
    * The issue title.
    */
-  title?: string;
+  title: string;
   /**
    * Text describing the issue.
    */
-  description?: string;
+  description: string;
   /**
    * A resource identifier for the user created the issue.
    */
-  userId?: string;
+  userId: string;
 }
 
 /**
- * Issue Contract details.
+ * Issue update Parameters.
  */
-export interface IssueContract extends Resource {
+export interface IssueUpdateContract {
   /**
    * Date and time when the issue was created.
    */
@@ -656,15 +656,15 @@ export interface IssueContract extends Resource {
   /**
    * The issue title.
    */
-  title: string;
+  title?: string;
   /**
    * Text describing the issue.
    */
-  description: string;
+  description?: string;
   /**
    * A resource identifier for the user created the issue.
    */
-  userId: string;
+  userId?: string;
 }
 
 /**
@@ -758,6 +758,11 @@ export interface DiagnosticContract extends Resource {
    * 'verbose', 'information', 'error'
    */
   verbosity?: Verbosity;
+  /**
+   * The format of the Operation Name for Application Insights telemetries. Default is Name.
+   * Possible values include: 'Name', 'Url'
+   */
+  operationNameFormat?: OperationNameFormat;
 }
 
 /**
@@ -990,9 +995,9 @@ export interface OperationEntityBaseContract {
 }
 
 /**
- * Api Operation Update Contract details.
+ * Api Operation details.
  */
-export interface OperationUpdateContract {
+export interface OperationContract extends Resource {
   /**
    * Collection of URL template parameters.
    */
@@ -1016,23 +1021,23 @@ export interface OperationUpdateContract {
   /**
    * Operation Name.
    */
-  displayName?: string;
+  displayName: string;
   /**
    * A Valid HTTP Operation Method. Typical Http Methods like GET, PUT, POST but not limited by
    * only them.
    */
-  method?: string;
+  method: string;
   /**
    * Relative URL template identifying the target resource for this operation. May include
    * parameters. Example: /customers/{cid}/orders/{oid}/?date={date}
    */
-  urlTemplate?: string;
+  urlTemplate: string;
 }
 
 /**
- * Api Operation details.
+ * Api Operation Update Contract details.
  */
-export interface OperationContract extends Resource {
+export interface OperationUpdateContract {
   /**
    * Collection of URL template parameters.
    */
@@ -1056,17 +1061,17 @@ export interface OperationContract extends Resource {
   /**
    * Operation Name.
    */
-  displayName: string;
+  displayName?: string;
   /**
    * A Valid HTTP Operation Method. Typical Http Methods like GET, PUT, POST but not limited by
    * only them.
    */
-  method: string;
+  method?: string;
   /**
    * Relative URL template identifying the target resource for this operation. May include
    * parameters. Example: /customers/{cid}/orders/{oid}/?date={date}
    */
-  urlTemplate: string;
+  urlTemplate?: string;
 }
 
 /**
@@ -1143,9 +1148,9 @@ export interface ApiRevisionContract {
 }
 
 /**
- * API update contract details.
+ * Api details.
  */
-export interface ApiUpdateContract {
+export interface ApiContract extends Resource {
   /**
    * Description of the API. May include HTML formatting tags.
    */
@@ -1196,11 +1201,16 @@ export interface ApiUpdateContract {
    */
   subscriptionRequired?: boolean;
   /**
-   * API name.
+   * API identifier of the source API.
+   */
+  sourceApiId?: string;
+  /**
+   * API name. Must be 1 to 300 characters long.
    */
   displayName?: string;
   /**
-   * Absolute URL of the backend service implementing this API.
+   * Absolute URL of the backend service implementing this API. Cannot be more than 2000 characters
+   * long.
    */
   serviceUrl?: string;
   /**
@@ -1208,17 +1218,21 @@ export interface ApiUpdateContract {
    * Management service instance. It is appended to the API endpoint base URL specified during the
    * service instance creation to form a public URL for this API.
    */
-  path?: string;
+  path: string;
   /**
    * Describes on which protocols the operations in this API can be invoked.
    */
   protocols?: Protocol[];
+  /**
+   * Version set details
+   */
+  apiVersionSet?: ApiVersionSetContractDetails;
 }
 
 /**
- * Api details.
+ * API update contract details.
  */
-export interface ApiContract extends Resource {
+export interface ApiUpdateContract {
   /**
    * Description of the API. May include HTML formatting tags.
    */
@@ -1269,16 +1283,11 @@ export interface ApiContract extends Resource {
    */
   subscriptionRequired?: boolean;
   /**
-   * API identifier of the source API.
-   */
-  sourceApiId?: string;
-  /**
-   * API name. Must be 1 to 300 characters long.
+   * API name.
    */
   displayName?: string;
   /**
-   * Absolute URL of the backend service implementing this API. Cannot be more than 2000 characters
-   * long.
+   * Absolute URL of the backend service implementing this API.
    */
   serviceUrl?: string;
   /**
@@ -1286,15 +1295,11 @@ export interface ApiContract extends Resource {
    * Management service instance. It is appended to the API endpoint base URL specified during the
    * service instance creation to form a public URL for this API.
    */
-  path: string;
+  path?: string;
   /**
    * Describes on which protocols the operations in this API can be invoked.
    */
   protocols?: Protocol[];
-  /**
-   * Version set details
-   */
-  apiVersionSet?: ApiVersionSetContractDetails;
 }
 
 /**
@@ -1420,9 +1425,9 @@ export interface ApiVersionSetEntityBase {
 }
 
 /**
- * Parameters to update or create an Api Version Set Contract.
+ * Api Version Set Contract details.
  */
-export interface ApiVersionSetUpdateParameters {
+export interface ApiVersionSetContract extends Resource {
   /**
    * Description of API Version Set.
    */
@@ -1439,18 +1444,18 @@ export interface ApiVersionSetUpdateParameters {
   /**
    * Name of API Version Set
    */
-  displayName?: string;
+  displayName: string;
   /**
    * An value that determines where the API Version identifer will be located in a HTTP request.
    * Possible values include: 'Segment', 'Query', 'Header'
    */
-  versioningScheme?: VersioningScheme;
+  versioningScheme: VersioningScheme;
 }
 
 /**
- * Api Version Set Contract details.
+ * Parameters to update or create an Api Version Set Contract.
  */
-export interface ApiVersionSetContract extends Resource {
+export interface ApiVersionSetUpdateParameters {
   /**
    * Description of API Version Set.
    */
@@ -1467,22 +1472,32 @@ export interface ApiVersionSetContract extends Resource {
   /**
    * Name of API Version Set
    */
-  displayName: string;
+  displayName?: string;
   /**
    * An value that determines where the API Version identifer will be located in a HTTP request.
    * Possible values include: 'Segment', 'Query', 'Header'
    */
-  versioningScheme: VersioningScheme;
+  versioningScheme?: VersioningScheme;
 }
 
 /**
- * Client or app secret used in IdentityProviders, Aad, OpenID or OAuth.
+ * OAuth Server Secrets Contract.
  */
-export interface ClientSecretContract {
+export interface AuthorizationServerSecretsContract {
   /**
-   * Client or app secret used in IdentityProviders, Aad, OpenID or OAuth.
+   * oAuth Authorization Server Secrets.
    */
   clientSecret?: string;
+  /**
+   * Can be optionally specified when resource owner password grant type is supported by this
+   * authorization server. Default resource owner username.
+   */
+  resourceOwnerUsername?: string;
+  /**
+   * Can be optionally specified when resource owner password grant type is supported by this
+   * authorization server. Default resource owner password.
+   */
+  resourceOwnerPassword?: string;
 }
 
 /**
@@ -1557,7 +1572,7 @@ export interface AuthorizationServerContractBaseProperties {
 /**
  * External OAuth authorization server settings.
  */
-export interface AuthorizationServerUpdateContract extends Resource {
+export interface AuthorizationServerContract extends Resource {
   /**
    * Description of the authorization server. Can contain HTML formatting tags.
    */
@@ -1610,24 +1625,24 @@ export interface AuthorizationServerUpdateContract extends Resource {
   /**
    * User-friendly authorization server name.
    */
-  displayName?: string;
+  displayName: string;
   /**
    * Optional reference to a page where client or app registration for this authorization server is
    * performed. Contains absolute URL to entity being referenced.
    */
-  clientRegistrationEndpoint?: string;
+  clientRegistrationEndpoint: string;
   /**
    * OAuth authorization endpoint. See http://tools.ietf.org/html/rfc6749#section-3.2.
    */
-  authorizationEndpoint?: string;
+  authorizationEndpoint: string;
   /**
    * Form of an authorization grant, which the client uses to request the access token.
    */
-  grantTypes?: GrantType[];
+  grantTypes: GrantType[];
   /**
    * Client or app id registered with this authorization server.
    */
-  clientId?: string;
+  clientId: string;
   /**
    * Client or app secret registered with this authorization server. This property will not be
    * filled on 'GET' operations! Use '/listSecrets' POST request to get the value.
@@ -1638,7 +1653,7 @@ export interface AuthorizationServerUpdateContract extends Resource {
 /**
  * External OAuth authorization server settings.
  */
-export interface AuthorizationServerContract extends Resource {
+export interface AuthorizationServerUpdateContract extends Resource {
   /**
    * Description of the authorization server. Can contain HTML formatting tags.
    */
@@ -1691,24 +1706,24 @@ export interface AuthorizationServerContract extends Resource {
   /**
    * User-friendly authorization server name.
    */
-  displayName: string;
+  displayName?: string;
   /**
    * Optional reference to a page where client or app registration for this authorization server is
    * performed. Contains absolute URL to entity being referenced.
    */
-  clientRegistrationEndpoint: string;
+  clientRegistrationEndpoint?: string;
   /**
    * OAuth authorization endpoint. See http://tools.ietf.org/html/rfc6749#section-3.2.
    */
-  authorizationEndpoint: string;
+  authorizationEndpoint?: string;
   /**
    * Form of an authorization grant, which the client uses to request the access token.
    */
-  grantTypes: GrantType[];
+  grantTypes?: GrantType[];
   /**
    * Client or app id registered with this authorization server.
    */
-  clientId: string;
+  clientId?: string;
   /**
    * Client or app secret registered with this authorization server. This property will not be
    * filled on 'GET' operations! Use '/listSecrets' POST request to get the value.
@@ -1884,9 +1899,9 @@ export interface BackendBaseParameters {
 }
 
 /**
- * Backend update parameters.
+ * Backend details.
  */
-export interface BackendUpdateParameters {
+export interface BackendContract extends Resource {
   /**
    * Backend Title.
    */
@@ -1919,17 +1934,17 @@ export interface BackendUpdateParameters {
   /**
    * Runtime Url of the Backend.
    */
-  url?: string;
+  url: string;
   /**
    * Backend communication protocol. Possible values include: 'http', 'soap'
    */
-  protocol?: BackendProtocol;
+  protocol: BackendProtocol;
 }
 
 /**
- * Backend details.
+ * Backend update parameters.
  */
-export interface BackendContract extends Resource {
+export interface BackendUpdateParameters {
   /**
    * Backend Title.
    */
@@ -1962,17 +1977,17 @@ export interface BackendContract extends Resource {
   /**
    * Runtime Url of the Backend.
    */
-  url: string;
+  url?: string;
   /**
    * Backend communication protocol. Possible values include: 'http', 'soap'
    */
-  protocol: BackendProtocol;
+  protocol?: BackendProtocol;
 }
 
 /**
- * Cache update details.
+ * Cache details.
  */
-export interface CacheUpdateParameters {
+export interface CacheContract extends Resource {
   /**
    * Cache description
    */
@@ -1980,7 +1995,7 @@ export interface CacheUpdateParameters {
   /**
    * Runtime connection string to cache
    */
-  connectionString?: string;
+  connectionString: string;
   /**
    * Original uri of entity in external system cache points to
    */
@@ -1988,9 +2003,9 @@ export interface CacheUpdateParameters {
 }
 
 /**
- * Cache details.
+ * Cache update details.
  */
-export interface CacheContract extends Resource {
+export interface CacheUpdateParameters {
   /**
    * Cache description
    */
@@ -1998,7 +2013,7 @@ export interface CacheContract extends Resource {
   /**
    * Runtime connection string to cache
    */
-  connectionString: string;
+  connectionString?: string;
   /**
    * Original uri of entity in external system cache points to
    */
@@ -2035,7 +2050,68 @@ export interface CertificateCreateOrUpdateParameters {
   /**
    * Password for the Certificate
    */
-  password: string;
+  password?: string;
+}
+
+/**
+ * Content type contract details.
+ */
+export interface ContentItemContract extends Resource {
+  /**
+   * Properties of the content item.
+   */
+  properties?: { [propertyName: string]: any };
+}
+
+/**
+ * Content type contract details.
+ */
+export interface ContentTypeContract extends Resource {
+  /**
+   * Content type identifier
+   */
+  contentTypeContractId?: string;
+  /**
+   * Content type name. Must be 1 to 250 characters long.
+   */
+  contentTypeContractName?: string;
+  /**
+   * Content type description.
+   */
+  description?: string;
+  /**
+   * Content type schema.
+   */
+  schema?: any;
+  /**
+   * Content type version.
+   */
+  version?: string;
+}
+
+/**
+ * Deleted Api Management Service information.
+ */
+export interface DeletedServiceContract extends Resource {
+  /**
+   * Fully-qualified API Management Service Resource ID
+   */
+  serviceId?: string;
+  /**
+   * UTC Date and Time when the service will be automatically purged. The date conforms to the
+   * following format: yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard.
+   */
+  scheduledPurgeDate?: Date;
+  /**
+   * UTC Timestamp when the service was soft-deleted. The date conforms to the following format:
+   * yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard.
+   */
+  deletionDate?: Date;
+  /**
+   * Api Management Service Master Location.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly location?: string;
 }
 
 /**
@@ -2233,6 +2309,10 @@ export interface AdditionalLocation {
    * SKU properties of the API Management service.
    */
   sku: ApiManagementServiceSkuProperties;
+  /**
+   * A list of availability zones denoting where the resource needs to come from.
+   */
+  zones?: string[];
   /**
    * Public Static Load Balanced IP addresses of the API Management service in the additional
    * location. Available only for Basic, Standard and Premium SKU.
@@ -2436,6 +2516,11 @@ export interface ApiManagementServiceBaseProperties {
    * Control Plane Apis version constraint for the API Management service.
    */
   apiVersionConstraint?: ApiVersionConstraint;
+  /**
+   * Undelete Api Management Service if it was previously soft-deleted. If this flag is specified
+   * and set to True all other properties will be ignored. Default value: false.
+   */
+  restore?: boolean;
 }
 
 /**
@@ -2648,6 +2733,11 @@ export interface ApiManagementServiceResource extends ApimResource {
    * Control Plane Apis version constraint for the API Management service.
    */
   apiVersionConstraint?: ApiVersionConstraint;
+  /**
+   * Undelete Api Management Service if it was previously soft-deleted. If this flag is specified
+   * and set to True all other properties will be ignored. Default value: false.
+   */
+  restore?: boolean;
   /**
    * Publisher email.
    */
@@ -2673,6 +2763,10 @@ export interface ApiManagementServiceResource extends ApimResource {
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly etag?: string;
+  /**
+   * A list of availability zones denoting where the resource needs to come from.
+   */
+  zones?: string[];
 }
 
 /**
@@ -2816,6 +2910,11 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
    * Control Plane Apis version constraint for the API Management service.
    */
   apiVersionConstraint?: ApiVersionConstraint;
+  /**
+   * Undelete Api Management Service if it was previously soft-deleted. If this flag is specified
+   * and set to True all other properties will be ignored. Default value: false.
+   */
+  restore?: boolean;
   /**
    * Publisher email.
    */
@@ -2960,13 +3059,17 @@ export interface EmailTemplateParametersContractProperties {
 }
 
 /**
- * Email Template update Parameters.
+ * Email Template details.
  */
-export interface EmailTemplateUpdateParameters {
+export interface EmailTemplateContract extends Resource {
   /**
    * Subject of the Template.
    */
-  subject?: string;
+  subject: string;
+  /**
+   * Email Template Body. This should be a valid XDocument
+   */
+  body: string;
   /**
    * Title of the Template.
    */
@@ -2976,9 +3079,10 @@ export interface EmailTemplateUpdateParameters {
    */
   description?: string;
   /**
-   * Email Template Body. This should be a valid XDocument
+   * Whether the template is the default template provided by Api Management or has been edited.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  body?: string;
+  readonly isDefault?: boolean;
   /**
    * Email Template Parameter values.
    */
@@ -2986,17 +3090,13 @@ export interface EmailTemplateUpdateParameters {
 }
 
 /**
- * Email Template details.
+ * Email Template update Parameters.
  */
-export interface EmailTemplateContract extends Resource {
+export interface EmailTemplateUpdateParameters {
   /**
    * Subject of the Template.
    */
-  subject: string;
-  /**
-   * Email Template Body. This should be a valid XDocument
-   */
-  body: string;
+  subject?: string;
   /**
    * Title of the Template.
    */
@@ -3006,10 +3106,9 @@ export interface EmailTemplateContract extends Resource {
    */
   description?: string;
   /**
-   * Whether the template is the default template provided by Api Management or has been edited.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * Email Template Body. This should be a valid XDocument
    */
-  readonly isDefault?: boolean;
+  body?: string;
   /**
    * Email Template Parameter values.
    */
@@ -3042,6 +3141,18 @@ export interface GatewayHostnameConfigurationContract extends Resource {
    * Determines whether gateway requests client certificate
    */
   negotiateClientCertificate?: boolean;
+  /**
+   * Specifies if TLS 1.0 is supported
+   */
+  tls10Enabled?: boolean;
+  /**
+   * Specifies if TLS 1.1 is supported
+   */
+  tls11Enabled?: boolean;
+  /**
+   * Specifies if HTTP/2.0 is supported
+   */
+  http2Enabled?: boolean;
 }
 
 /**
@@ -3237,55 +3348,55 @@ export interface UserContract extends Resource {
 }
 
 /**
- * Parameters supplied to the Update Group operation.
+ * Contract details.
  */
-export interface GroupUpdateParameters {
+export interface GroupContract extends Resource {
   /**
    * Group name.
    */
-  displayName?: string;
+  displayName: string;
   /**
-   * Group description.
+   * Group description. Can contain HTML formatting tags.
    */
   description?: string;
   /**
-   * Group type. Possible values include: 'custom', 'system', 'external'
+   * true if the group is one of the three system groups (Administrators, Developers, or Guests);
+   * otherwise false.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  type?: GroupType;
+  readonly builtIn?: boolean;
   /**
-   * Identifier of the external groups, this property contains the id of the group from the
-   * external identity provider, e.g. for Azure Active Directory
-   * `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null.
+   * Group type. Possible values include: 'custom', 'system', 'external'
+   */
+  groupContractType?: GroupType;
+  /**
+   * For external groups, this property contains the id of the group from the external identity
+   * provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object
+   * id>`; otherwise the value is null.
    */
   externalId?: string;
 }
 
 /**
- * Contract details.
+ * Parameters supplied to the Update Group operation.
  */
-export interface GroupContract extends Resource {
+export interface GroupUpdateParameters {
   /**
    * Group name.
    */
-  displayName: string;
+  displayName?: string;
   /**
-   * Group description. Can contain HTML formatting tags.
+   * Group description.
    */
   description?: string;
-  /**
-   * true if the group is one of the three system groups (Administrators, Developers, or Guests);
-   * otherwise false.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly builtIn?: boolean;
   /**
    * Group type. Possible values include: 'custom', 'system', 'external'
    */
-  groupContractType?: GroupType;
+  type?: GroupType;
   /**
-   * For external groups, this property contains the id of the group from the external identity
-   * provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object
-   * id>`; otherwise the value is null.
+   * Identifier of the external groups, this property contains the id of the group from the
+   * external identity provider, e.g. for Azure Active Directory
+   * `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null.
    */
   externalId?: string;
 }
@@ -3314,6 +3425,16 @@ export interface GroupCreateParameters {
   externalId?: string;
 }
 
+/**
+ * Client or app secret used in IdentityProviders, Aad, OpenID or OAuth.
+ */
+export interface ClientSecretContract {
+  /**
+   * Client or app secret used in IdentityProviders, Aad, OpenID or OAuth.
+   */
+  clientSecret?: string;
+}
+
 /**
  * Identity Provider Base Parameter Properties.
  */
@@ -3354,14 +3475,14 @@ export interface IdentityProviderBaseParameters {
 }
 
 /**
- * Parameters supplied to update Identity Provider
+ * Identity Provider details.
  */
-export interface IdentityProviderUpdateParameters {
+export interface IdentityProviderContract extends Resource {
   /**
    * Identity Provider Type identifier. Possible values include: 'facebook', 'google', 'microsoft',
    * 'twitter', 'aad', 'aadB2C'
    */
-  type?: IdentityProviderType;
+  identityProviderContractType?: IdentityProviderType;
   /**
    * The TenantId to use instead of Common when logging into Active Directory
    */
@@ -3394,24 +3515,25 @@ export interface IdentityProviderUpdateParameters {
    * Client Id of the Application in the external Identity Provider. It is App ID for Facebook
    * login, Client ID for Google login, App ID for Microsoft.
    */
-  clientId?: string;
+  clientId: string;
   /**
    * Client secret of the Application in external Identity Provider, used to authenticate login
    * request. For example, it is App Secret for Facebook login, API Key for Google login, Public
-   * Key for Microsoft.
+   * Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets'
+   * POST request to get the value.
    */
   clientSecret?: string;
 }
 
 /**
- * Identity Provider details.
+ * Parameters supplied to update Identity Provider
  */
-export interface IdentityProviderContract extends Resource {
+export interface IdentityProviderUpdateParameters {
   /**
    * Identity Provider Type identifier. Possible values include: 'facebook', 'google', 'microsoft',
    * 'twitter', 'aad', 'aadB2C'
    */
-  identityProviderContractType?: IdentityProviderType;
+  type?: IdentityProviderType;
   /**
    * The TenantId to use instead of Common when logging into Active Directory
    */
@@ -3444,12 +3566,11 @@ export interface IdentityProviderContract extends Resource {
    * Client Id of the Application in the external Identity Provider. It is App ID for Facebook
    * login, Client ID for Google login, App ID for Microsoft.
    */
-  clientId: string;
+  clientId?: string;
   /**
    * Client secret of the Application in external Identity Provider, used to authenticate login
    * request. For example, it is App Secret for Facebook login, API Key for Google login, Public
-   * Key for Microsoft. This property will not be filled on 'GET' operations! Use '/listSecrets'
-   * POST request to get the value.
+   * Key for Microsoft.
    */
   clientSecret?: string;
 }
@@ -3506,65 +3627,109 @@ export interface IdentityProviderCreateContract extends Resource {
 }
 
 /**
- * Logger update contract.
+ * Logger details.
  */
-export interface LoggerUpdateContract {
+export interface LoggerContract extends Resource {
   /**
-   * Logger type. Possible values include: 'azureEventHub', 'applicationInsights'
+   * Logger type. Possible values include: 'azureEventHub', 'applicationInsights', 'azureMonitor'
    */
-  loggerType?: LoggerType;
+  loggerType: LoggerType;
   /**
    * Logger description.
    */
   description?: string;
   /**
-   * Logger credentials.
+   * The name and SendRule connection string of the event hub for azureEventHub logger.
+   * Instrumentation key for applicationInsights logger.
    */
   credentials?: { [propertyName: string]: string };
   /**
    * Whether records are buffered in the logger before publishing. Default is assumed to be true.
    */
   isBuffered?: boolean;
+  /**
+   * Azure Resource Id of a log target (either Azure Event Hub resource or Azure Application
+   * Insights resource).
+   */
+  resourceId?: string;
 }
 
 /**
- * Logger details.
+ * Logger update contract.
  */
-export interface LoggerContract extends Resource {
+export interface LoggerUpdateContract {
   /**
-   * Logger type. Possible values include: 'azureEventHub', 'applicationInsights'
+   * Logger type. Possible values include: 'azureEventHub', 'applicationInsights', 'azureMonitor'
    */
-  loggerType: LoggerType;
+  loggerType?: LoggerType;
   /**
    * Logger description.
    */
   description?: string;
   /**
-   * The name and SendRule connection string of the event hub for azureEventHub logger.
-   * Instrumentation key for applicationInsights logger.
+   * Logger credentials.
    */
-  credentials: { [propertyName: string]: string };
+  credentials?: { [propertyName: string]: string };
   /**
    * Whether records are buffered in the logger before publishing. Default is assumed to be true.
    */
   isBuffered?: boolean;
-  /**
-   * Azure Resource Id of a log target (either Azure Event Hub resource or Azure Application
-   * Insights resource).
-   */
-  resourceId?: string;
 }
 
 /**
  * Client or app secret used in IdentityProviders, Aad, OpenID or OAuth.
  */
-export interface PropertyValueContract {
+export interface NamedValueSecretContract {
   /**
    * This is secret value of the NamedValue entity.
    */
   value?: string;
 }
 
+/**
+ * Issue contract Update Properties.
+ */
+export interface KeyVaultLastAccessStatusContractProperties {
+  /**
+   * Last status code for sync and refresh of secret from key vault.
+   */
+  code?: string;
+  /**
+   * Details of the error else empty.
+   */
+  message?: string;
+  /**
+   * Last time secret was accessed. The date conforms to the following format:
+   * `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.
+   */
+  timeStampUtc?: Date;
+}
+
+/**
+ * Create keyVault contract details.
+ */
+export interface KeyVaultContractCreateProperties {
+  /**
+   * Key vault secret identifier for fetching secret.
+   */
+  secretIdentifier?: string;
+  /**
+   * SystemAssignedIdentity or UserAssignedIdentity Client Id which will be used to access key
+   * vault secret.
+   */
+  identityClientId?: string;
+}
+
+/**
+ * KeyVault contract details.
+ */
+export interface KeyVaultContractProperties extends KeyVaultContractCreateProperties {
+  /**
+   * Last time sync and refresh status of secret from key vault.
+   */
+  lastStatus?: KeyVaultLastAccessStatusContractProperties;
+}
+
 /**
  * NamedValue Entity Base Parameters set.
  */
@@ -3604,6 +3769,10 @@ export interface NamedValueContract extends Resource {
    * request to get the value.
    */
   value?: string;
+  /**
+   * KeyVault location details of the namedValue.
+   */
+  keyVault?: KeyVaultContractProperties;
 }
 
 /**
@@ -3629,6 +3798,10 @@ export interface NamedValueUpdateParameters {
    * of whitespace.
    */
   value?: string;
+  /**
+   * KeyVault location details of the namedValue.
+   */
+  keyVault?: KeyVaultContractCreateProperties;
 }
 
 /**
@@ -3654,7 +3827,11 @@ export interface NamedValueCreateContract extends Resource {
    * of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST
    * request to get the value.
    */
-  value: string;
+  value?: string;
+  /**
+   * KeyVault location details of the namedValue.
+   */
+  keyVault?: KeyVaultContractCreateProperties;
 }
 
 /**
@@ -3688,6 +3865,14 @@ export interface ConnectivityStatusContract {
    * the ISO 8601 standard.
    */
   lastStatusChange: Date;
+  /**
+   * Resource Type.
+   */
+  resourceType: string;
+  /**
+   * Whether this is optional.
+   */
+  isOptional: boolean;
 }
 
 /**
@@ -3799,13 +3984,13 @@ export interface NotificationContract extends Resource {
 }
 
 /**
- * Parameters supplied to the Update OpenID Connect Provider operation.
+ * OpenId Connect Provider details.
  */
-export interface OpenidConnectProviderUpdateContract {
+export interface OpenidConnectProviderContract extends Resource {
   /**
    * User-friendly OpenID Connect Provider name.
    */
-  displayName?: string;
+  displayName: string;
   /**
    * User-friendly description of OpenID Connect Provider.
    */
@@ -3813,11 +3998,11 @@ export interface OpenidConnectProviderUpdateContract {
   /**
    * Metadata endpoint URI.
    */
-  metadataEndpoint?: string;
+  metadataEndpoint: string;
   /**
    * Client ID of developer console which is the client application.
    */
-  clientId?: string;
+  clientId: string;
   /**
    * Client Secret of developer console which is the client application.
    */
@@ -3825,13 +4010,13 @@ export interface OpenidConnectProviderUpdateContract {
 }
 
 /**
- * OpenId Connect Provider details.
+ * Parameters supplied to the Update OpenID Connect Provider operation.
  */
-export interface OpenidConnectProviderContract extends Resource {
+export interface OpenidConnectProviderUpdateContract {
   /**
    * User-friendly OpenID Connect Provider name.
    */
-  displayName: string;
+  displayName?: string;
   /**
    * User-friendly description of OpenID Connect Provider.
    */
@@ -3839,11 +4024,11 @@ export interface OpenidConnectProviderContract extends Resource {
   /**
    * Metadata endpoint URI.
    */
-  metadataEndpoint: string;
+  metadataEndpoint?: string;
   /**
    * Client ID of developer console which is the client application.
    */
-  clientId: string;
+  clientId?: string;
   /**
    * Client Secret of developer console which is the client application.
    */
@@ -4047,7 +4232,8 @@ export interface SubscriptionContract extends Resource {
    */
   secondaryKey?: string;
   /**
-   * Optional subscription comment added by an administrator.
+   * Optional subscription comment added by an administrator when the state is changed to the
+   * 'rejected'.
    */
   stateComment?: string;
   /**
@@ -4145,6 +4331,20 @@ export interface QuotaCounterContract {
   value?: QuotaCounterValueContractProperties;
 }
 
+/**
+ * Quota counter value details.
+ */
+export interface QuotaCounterValueUpdateContract {
+  /**
+   * Number of times Counter was called.
+   */
+  callsCount?: number;
+  /**
+   * Data Transferred in KiloBytes.
+   */
+  kbTransferred?: number;
+}
+
 /**
  * Paged Quota Counter list representation.
  */
@@ -4421,7 +4621,8 @@ export interface SubscriptionUpdateParameters {
    */
   state?: SubscriptionState;
   /**
-   * Comments describing subscription state change by the administrator.
+   * Comments describing subscription state change by the administrator when the state is changed
+   * to the 'rejected'.
    */
   stateComment?: string;
   /**
@@ -4747,8 +4948,8 @@ export interface UserCreateParameters {
    */
   password?: string;
   /**
-   * Determines the type of application which send the create user request. Default is old
-   * publisher portal. Possible values include: 'developerPortal'
+   * Determines the type of application which send the create user request. Default is legacy
+   * portal. Possible values include: 'portal', 'developerPortal'
    */
   appType?: AppType;
   /**
@@ -4799,14 +5000,14 @@ export interface QuotaCounterValueContract {
  */
 export interface ApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| isCurrent | filter | eq, ne |  |</br>
    */
   filter?: string;
   /**
@@ -4853,16 +5054,15 @@ export interface ApiDeleteMethodOptionalParams extends msRest.RequestOptionsBase
  */
 export interface ApiListByTagsOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * | Field       | Supported operators    | Supported functions               |
-   * |-------------|------------------------|-----------------------------------|
-   *
-   * |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |displayName | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |apiRevision | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |path | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |description | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |serviceUrl | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
-   * |isCurrent | eq |    |
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
+   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiRevision |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+   * endswith |</br>| isCurrent | filter | eq |     |</br>
    */
   filter?: string;
   /**
@@ -4895,9 +5095,9 @@ export interface ApiBeginCreateOrUpdateOptionalParams extends msRest.RequestOpti
  */
 export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| apiRevision | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -4915,9 +5115,9 @@ export interface ApiRevisionListByServiceOptionalParams extends msRest.RequestOp
  */
 export interface ApiReleaseListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| notes | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -4946,14 +5146,14 @@ export interface ApiReleaseCreateOrUpdateOptionalParams extends msRest.RequestOp
  */
 export interface ApiOperationListByApiOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| method | filter
-   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| method | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>
    */
   filter?: string;
   /**
@@ -5007,10 +5207,10 @@ export interface ApiOperationPolicyCreateOrUpdateOptionalParams extends msRest.R
  */
 export interface TagListByOperationOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| name | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5028,10 +5228,10 @@ export interface TagListByOperationOptionalParams extends msRest.RequestOptionsB
  */
 export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| name | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5049,10 +5249,10 @@ export interface TagListByApiOptionalParams extends msRest.RequestOptionsBase {
  */
 export interface TagListByProductOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| name | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5070,10 +5270,10 @@ export interface TagListByProductOptionalParams extends msRest.RequestOptionsBas
  */
 export interface TagListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5106,9 +5306,9 @@ export interface TagCreateOrUpdateOptionalParams extends msRest.RequestOptionsBa
  */
 export interface ApiProductListByApisOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5147,9 +5347,9 @@ export interface ApiPolicyCreateOrUpdateOptionalParams extends msRest.RequestOpt
  */
 export interface ApiSchemaListByApiOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| contentType | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5199,9 +5399,9 @@ export interface ApiSchemaBeginCreateOrUpdateOptionalParams extends msRest.Reque
  */
 export interface ApiDiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5230,11 +5430,11 @@ export interface ApiDiagnosticCreateOrUpdateOptionalParams extends msRest.Reques
  */
 export interface ApiIssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| userId | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| state | filter | eq
-   * |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter | eq |
+   * |</br>
    */
   filter?: string;
   /**
@@ -5277,10 +5477,10 @@ export interface ApiIssueCreateOrUpdateOptionalParams extends msRest.RequestOpti
  */
 export interface ApiIssueCommentListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| userId | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5309,10 +5509,10 @@ export interface ApiIssueCommentCreateOrUpdateOptionalParams extends msRest.Requ
  */
 export interface ApiIssueAttachmentListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| userId | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5341,10 +5541,10 @@ export interface ApiIssueAttachmentCreateOrUpdateOptionalParams extends msRest.R
  */
 export interface ApiTagDescriptionListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| name | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5373,15 +5573,15 @@ export interface ApiTagDescriptionCreateOrUpdateOptionalParams extends msRest.Re
  */
 export interface OperationListByTagsOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| apiName | filter
-   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| method
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiName | filter
+   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| method |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>
    */
   filter?: string;
   /**
@@ -5403,7 +5603,7 @@ export interface OperationListByTagsOptionalParams extends msRest.RequestOptions
  */
 export interface ApiVersionSetListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>
    */
   filter?: string;
@@ -5433,10 +5633,10 @@ export interface ApiVersionSetCreateOrUpdateOptionalParams extends msRest.Reques
  */
 export interface AuthorizationServerListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5465,11 +5665,11 @@ export interface AuthorizationServerCreateOrUpdateOptionalParams extends msRest.
  */
 export interface BackendListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| title | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| url | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| title | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| url | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5533,12 +5733,12 @@ export interface CacheCreateOrUpdateOptionalParams extends msRest.RequestOptions
  */
 export interface CertificateListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| subject | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| thumbprint | filter
-   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| expirationDate
-   * | filter | ge, le, eq, ne, gt, lt |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| subject | filter | ge,
+   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| thumbprint | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| expirationDate |
+   * filter | ge, le, eq, ne, gt, lt |     |</br>
    */
   filter?: string;
   /**
@@ -5562,6 +5762,28 @@ export interface CertificateCreateOrUpdateOptionalParams extends msRest.RequestO
   ifMatch?: string;
 }
 
+/**
+ * Optional Parameters.
+ */
+export interface ContentTypeCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * ETag of the Entity. Not required when creating an entity, but required when updating an
+   * entity.
+   */
+  ifMatch?: string;
+}
+
+/**
+ * Optional Parameters.
+ */
+export interface ContentTypeContentItemCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * ETag of the Entity. Not required when creating an entity, but required when updating an
+   * entity.
+   */
+  ifMatch?: string;
+}
+
 /**
  * Optional Parameters.
  */
@@ -5591,9 +5813,9 @@ export interface ApiManagementServiceBeginApplyNetworkConfigurationUpdatesOption
  */
 export interface DiagnosticListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5622,9 +5844,9 @@ export interface DiagnosticCreateOrUpdateOptionalParams extends msRest.RequestOp
  */
 export interface EmailTemplateListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5652,6 +5874,14 @@ export interface EmailTemplateCreateOrUpdateOptionalParams extends msRest.Reques
  * Optional Parameters.
  */
 export interface GatewayListByServiceOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
+   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| region | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
+   */
+  filter?: string;
   /**
    * Number of records to return.
    */
@@ -5677,6 +5907,13 @@ export interface GatewayCreateOrUpdateOptionalParams extends msRest.RequestOptio
  * Optional Parameters.
  */
 export interface GatewayHostnameConfigurationListByServiceOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
+   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| hostname | filter | ge,
+   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
+   */
+  filter?: string;
   /**
    * Number of records to return.
    */
@@ -5687,10 +5924,27 @@ export interface GatewayHostnameConfigurationListByServiceOptionalParams extends
   skip?: number;
 }
 
+/**
+ * Optional Parameters.
+ */
+export interface GatewayHostnameConfigurationCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * ETag of the Entity. Not required when creating an entity, but required when updating an
+   * entity.
+   */
+  ifMatch?: string;
+}
+
 /**
  * Optional Parameters.
  */
 export interface GatewayApiListByServiceOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
+   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
+   */
+  filter?: string;
   /**
    * Number of records to return.
    */
@@ -5713,12 +5967,12 @@ export interface GatewayApiCreateOrUpdateOptionalParams extends msRest.RequestOp
  */
 export interface GroupListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * aadObjectId | filter | eq |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * externalId | filter | eq |     |</br>
    */
   filter?: string;
   /**
@@ -5747,14 +6001,14 @@ export interface GroupCreateOrUpdateOptionalParams extends msRest.RequestOptions
  */
 export interface GroupUserListOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| firstName | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| lastName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| email | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| registrationDate
-   * | filter | ge, le, eq, ne, gt, lt |     | </br>| note | filter | ge, le, eq, ne, gt, lt |
-   * substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| firstName | filter | ge,
+   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| lastName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| email | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| registrationDate
+   * | filter | ge, le, eq, ne, gt, lt |     |</br>| note | filter | ge, le, eq, ne, gt, lt |
+   * substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5783,14 +6037,14 @@ export interface IdentityProviderCreateOrUpdateOptionalParams extends msRest.Req
  */
 export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| apiId | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| title | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| authorName |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| state |
-   * filter | eq |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiId | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| title | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| authorName |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state |
+   * filter | eq |     |</br>
    */
   filter?: string;
   /**
@@ -5808,12 +6062,12 @@ export interface IssueListByServiceOptionalParams extends msRest.RequestOptionsB
  */
 export interface LoggerListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| loggerType |
-   * filter | eq |     | </br>| resourceId | filter | ge, le, eq, ne, gt, lt | substringof,
-   * contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| loggerType |
+   * filter | eq |     |</br>| resourceId | filter | ge, le, eq, ne, gt, lt | substringof,
+   * contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5837,25 +6091,15 @@ export interface LoggerCreateOrUpdateOptionalParams extends msRest.RequestOption
   ifMatch?: string;
 }
 
-/**
- * Optional Parameters.
- */
-export interface LoggerDeleteMethodOptionalParams extends msRest.RequestOptionsBase {
-  /**
-   * Force deletion even if diagnostic is attached.
-   */
-  force?: boolean;
-}
-
 /**
  * Optional Parameters.
  */
 export interface NamedValueListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| tags | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith, any, all | </br>| displayName |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith, any, all |</br>| displayName |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -5920,10 +6164,10 @@ export interface NotificationCreateOrUpdateOptionalParams extends msRest.Request
  */
 export interface OpenIdConnectProviderListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -6016,13 +6260,13 @@ export interface DelegationSettingsCreateOrUpdateOptionalParams extends msRest.R
  */
 export interface ProductListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| terms |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| state |
-   * filter | eq |     | </br>| groups | expand |     |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| terms |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state |
+   * filter | eq |     |</br>| groups | expand |     |     |</br>
    */
   filter?: string;
   /**
@@ -6070,13 +6314,13 @@ export interface ProductDeleteMethodOptionalParams extends msRest.RequestOptions
  */
 export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| terms |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| state |
-   * filter | eq | substringof, contains, startswith, endswith | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| terms |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state |
+   * filter | eq | substringof, contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -6098,14 +6342,14 @@ export interface ProductListByTagsOptionalParams extends msRest.RequestOptionsBa
  */
 export interface ProductApiListByProductOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| description |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| path | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>
    */
   filter?: string;
   /**
@@ -6123,10 +6367,10 @@ export interface ProductApiListByProductOptionalParams extends msRest.RequestOpt
  */
 export interface ProductGroupListByProductOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt |     | </br>| displayName | filter | eq, ne |     | </br>| description |
-   * filter | eq, ne |     | </br>
+   * eq, ne, gt, lt |     |</br>| displayName | filter | eq, ne |     |</br>| description | filter
+   * | eq, ne |     |</br>
    */
   filter?: string;
   /**
@@ -6144,16 +6388,16 @@ export interface ProductGroupListByProductOptionalParams extends msRest.RequestO
  */
 export interface ProductSubscriptionsListOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| stateComment |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| ownerId
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| scope
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-   * endswith | </br>| state | filter | eq |     | </br>| user | expand |     |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| stateComment |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| ownerId
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| scope
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| state | filter | eq |     |</br>| user | expand |     |     |</br>
    */
   filter?: string;
   /**
@@ -6328,16 +6572,16 @@ export interface ReportsListByRequestOptionalParams extends msRest.RequestOption
  */
 export interface SubscriptionListOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| stateComment |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| ownerId
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| scope
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-   * endswith | </br>| state | filter | eq |     | </br>| user | expand |     |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| stateComment |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| ownerId
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| scope
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| userId
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| state | filter | eq |     |</br>| user | expand |     |     |</br>
    */
   filter?: string;
   /**
@@ -6365,6 +6609,12 @@ export interface SubscriptionCreateOrUpdateOptionalParams extends msRest.Request
    * entity.
    */
   ifMatch?: string;
+  /**
+   * Determines the type of application which send the create user request. Default is legacy
+   * publisher portal. Possible values include: 'portal', 'developerPortal'. Default value:
+   * 'portal'.
+   */
+  appType?: AppType;
 }
 
 /**
@@ -6377,6 +6627,12 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
    * - If true, send email notification of change of state of subscription
    */
   notify?: boolean;
+  /**
+   * Determines the type of application which send the create user request. Default is legacy
+   * publisher portal. Possible values include: 'portal', 'developerPortal'. Default value:
+   * 'portal'.
+   */
+  appType?: AppType;
 }
 
 /**
@@ -6384,21 +6640,21 @@ export interface SubscriptionUpdateOptionalParams extends msRest.RequestOptionsB
  */
 export interface TagResourceListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| aid | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| apiName | filter
-   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| apiRevision |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| path |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-   * endswith | </br>| method | filter | ge, le, eq, ne, gt, lt | substringof, contains,
-   * startswith, endswith | </br>| urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof,
-   * contains, startswith, endswith | </br>| terms | filter | ge, le, eq, ne, gt, lt | substringof,
-   * contains, startswith, endswith | </br>| state | filter | eq |     | </br>| isCurrent | filter
-   * | eq |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| name | filter | ge, le,
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| displayName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiName | filter
+   * | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| apiRevision |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| path |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| serviceUrl | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+   * endswith |</br>| method | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+   * endswith |</br>| urlTemplate | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>| terms | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>| state | filter | eq |     |</br>| isCurrent | filter | eq |
+   * |</br>
    */
   filter?: string;
   /**
@@ -6416,15 +6672,15 @@ export interface TagResourceListByServiceOptionalParams extends msRest.RequestOp
  */
 export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
    * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| firstName | filter | ge,
-   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| lastName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| email | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| state | filter |
-   * eq |     | </br>| registrationDate | filter | ge, le, eq, ne, gt, lt |     | </br>| note |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| groups
-   * | expand |     |     | </br>
+   * eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| firstName | filter | ge,
+   * le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| lastName | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| email | filter |
+   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| state | filter |
+   * eq |     |</br>| registrationDate | filter | ge, le, eq, ne, gt, lt |     |</br>| note |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>| groups |
+   * expand |     |     |</br>
    */
   filter?: string;
   /**
@@ -6445,6 +6701,10 @@ export interface UserListByServiceOptionalParams extends msRest.RequestOptionsBa
  * Optional Parameters.
  */
 export interface UserCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * Send an Email notification to the User.
+   */
+  notify?: boolean;
   /**
    * ETag of the Entity. Not required when creating an entity, but required when updating an
    * entity.
@@ -6464,6 +6724,12 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
    * Send an Account Closed Email notification to the User.
    */
   notify?: boolean;
+  /**
+   * Determines the type of application which send the create user request. Default is legacy
+   * publisher portal. Possible values include: 'portal', 'developerPortal'. Default value:
+   * 'portal'.
+   */
+  appType?: AppType;
 }
 
 /**
@@ -6471,11 +6737,12 @@ export interface UserDeleteMethodOptionalParams extends msRest.RequestOptionsBas
  */
 export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
-   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| description |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>
+   * |     Field     |     Usage     |     Supported operators     |     Supported functions
+   * |</br>|-------------|------------------------|-----------------------------------|</br>| name
+   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |</br>|
+   * displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>| description | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+   * endswith |</br>
    */
   filter?: string;
   /**
@@ -6493,16 +6760,16 @@ export interface UserGroupListOptionalParams extends msRest.RequestOptionsBase {
  */
 export interface UserSubscriptionListOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * |   Field     |     Usage     |     Supported operators     |     Supported functions
-   * |</br>|-------------|-------------|-------------|-------------|</br>| name | filter | ge, le,
-   * eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| displayName | filter |
-   * ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| stateComment |
-   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| ownerId
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>| scope
-   * | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith | </br>|
-   * userId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith |
-   * </br>| productId | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
-   * endswith | </br>
+   * | Field     |     Usage     |     Supported operators    | Supported functions
+   * |</br>|-------------|------------------------|-----------------------------------|</br>|name |
+   * filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith
+   * |</br>|displayName | filter | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+   * endswith |</br>|stateComment | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>|ownerId | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>|scope | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>|userId | filter | ge, le, eq, ne, gt, lt | substringof, contains,
+   * startswith, endswith |</br>|productId | filter | ge, le, eq, ne, gt, lt | substringof,
+   * contains, startswith, endswith |</br>
    */
   filter?: string;
   /**
@@ -6515,6 +6782,18 @@ export interface UserSubscriptionListOptionalParams extends msRest.RequestOption
   skip?: number;
 }
 
+/**
+ * Optional Parameters.
+ */
+export interface UserConfirmationPasswordSendOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * Determines the type of application which send the create user request. Default is legacy
+   * publisher portal. Possible values include: 'portal', 'developerPortal'. Default value:
+   * 'portal'.
+   */
+  appType?: AppType;
+}
+
 /**
  * An interface representing ApiManagementClientOptions.
  */
@@ -6555,6 +6834,17 @@ export interface ApiCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ApiUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -6589,9 +6879,9 @@ export interface ApiReleaseCreateOrUpdateHeaders {
 }
 
 /**
- * Defines headers for GetEntityTag operation.
+ * Defines headers for Update operation.
  */
-export interface ApiOperationGetEntityTagHeaders {
+export interface ApiReleaseUpdateHeaders {
   /**
    * Current entity state version. Should be treated as opaque and used to make conditional HTTP
    * requests.
@@ -6600,9 +6890,20 @@ export interface ApiOperationGetEntityTagHeaders {
 }
 
 /**
- * Defines headers for Get operation.
+ * Defines headers for GetEntityTag operation.
  */
-export interface ApiOperationGetHeaders {
+export interface ApiOperationGetEntityTagHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for Get operation.
+ */
+export interface ApiOperationGetHeaders {
   /**
    * Current entity state version. Should be treated as opaque and used to make conditional HTTP
    * requests.
@@ -6621,6 +6922,17 @@ export interface ApiOperationCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ApiOperationUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -6775,6 +7087,17 @@ export interface ApiDiagnosticCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ApiDiagnosticUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -6808,6 +7131,17 @@ export interface ApiIssueCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ApiIssueUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -6973,6 +7307,17 @@ export interface ApiVersionSetCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ApiVersionSetUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7006,6 +7351,28 @@ export interface AuthorizationServerCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface AuthorizationServerUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for ListSecrets operation.
+ */
+export interface AuthorizationServerListSecretsHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7039,6 +7406,17 @@ export interface BackendCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface BackendUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7072,6 +7450,17 @@ export interface CacheCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface CacheUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7105,6 +7494,61 @@ export interface CertificateCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Get operation.
+ */
+export interface ContentTypeGetHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for CreateOrUpdate operation.
+ */
+export interface ContentTypeCreateOrUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for GetEntityTag operation.
+ */
+export interface ContentTypeContentItemGetEntityTagHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for Get operation.
+ */
+export interface ContentTypeContentItemGetHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for CreateOrUpdate operation.
+ */
+export interface ContentTypeContentItemCreateOrUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7138,6 +7582,17 @@ export interface DiagnosticCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface DiagnosticUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7160,6 +7615,17 @@ export interface EmailTemplateGetHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface EmailTemplateUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7193,6 +7659,17 @@ export interface GatewayCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface GatewayUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for ListKeys operation.
  */
@@ -7281,6 +7758,17 @@ export interface GroupCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface GroupUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7314,6 +7802,28 @@ export interface IdentityProviderCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface IdentityProviderUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for ListSecrets operation.
+ */
+export interface IdentityProviderListSecretsHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for Get operation.
  */
@@ -7358,6 +7868,17 @@ export interface LoggerCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface LoggerUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7402,6 +7923,17 @@ export interface NamedValueUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for ListValue operation.
+ */
+export interface NamedValueListValueHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7435,6 +7967,28 @@ export interface OpenIdConnectProviderCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface OpenIdConnectProviderUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for ListSecrets operation.
+ */
+export interface OpenIdConnectProviderListSecretsHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7567,6 +8121,17 @@ export interface ProductCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface ProductUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7656,9 +8221,9 @@ export interface SubscriptionCreateOrUpdateHeaders {
 }
 
 /**
- * Defines headers for GetEntityState operation.
+ * Defines headers for Update operation.
  */
-export interface TagGetEntityStateHeaders {
+export interface SubscriptionUpdateHeaders {
   /**
    * Current entity state version. Should be treated as opaque and used to make conditional HTTP
    * requests.
@@ -7667,7 +8232,29 @@ export interface TagGetEntityStateHeaders {
 }
 
 /**
- * Defines headers for Get operation.
+ * Defines headers for ListSecrets operation.
+ */
+export interface SubscriptionListSecretsHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for GetEntityState operation.
+ */
+export interface TagGetEntityStateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
+/**
+ * Defines headers for Get operation.
  */
 export interface TagGetHeaders {
   /**
@@ -7688,6 +8275,17 @@ export interface TagCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface TagUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for GetEntityTag operation.
  */
@@ -7710,6 +8308,17 @@ export interface TenantAccessGetHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface TenantAccessUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * Defines headers for ListSecrets operation.
  */
@@ -7776,6 +8385,17 @@ export interface UserCreateOrUpdateHeaders {
   eTag: string;
 }
 
+/**
+ * Defines headers for Update operation.
+ */
+export interface UserUpdateHeaders {
+  /**
+   * Current entity state version. Should be treated as opaque and used to make conditional HTTP
+   * requests.
+   */
+  eTag: string;
+}
+
 /**
  * @interface
  * Paged Api list representation.
@@ -8004,6 +8624,45 @@ export interface CertificateCollection extends Array<CertificateContract> {
   nextLink?: string;
 }
 
+/**
+ * @interface
+ * Paged list of content types.
+ * @extends Array<ContentTypeContract>
+ */
+export interface ContentTypeCollection extends Array<ContentTypeContract> {
+  /**
+   * Next page link, if any.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextLink?: string;
+}
+
+/**
+ * @interface
+ * Paged list of content items.
+ * @extends Array<ContentItemContract>
+ */
+export interface ContentItemCollection extends Array<ContentItemContract> {
+  /**
+   * Next page link, if any.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextLink?: string;
+}
+
+/**
+ * @interface
+ * Paged deleted Api Management Services List Representation.
+ * @extends Array<DeletedServiceContract>
+ */
+export interface DeletedServicesCollection extends Array<DeletedServiceContract> {
+  /**
+   * Next page link if any.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextLink?: string;
+}
+
 /**
  * @interface
  * Result of the request to list REST API operations. It contains a list of operations and a URL
@@ -8337,6 +8996,14 @@ export type HttpCorrelationProtocol = 'None' | 'Legacy' | 'W3C';
  */
 export type Verbosity = 'verbose' | 'information' | 'error';
 
+/**
+ * Defines values for OperationNameFormat.
+ * Possible values include: 'Name', 'Url'
+ * @readonly
+ * @enum {string}
+ */
+export type OperationNameFormat = 'Name' | 'Url';
+
 /**
  * Defines values for PolicyContentFormat.
  * Possible values include: 'xml', 'xml-link', 'rawxml', 'rawxml-link'
@@ -8461,11 +9128,11 @@ export type KeyType = 'primary' | 'secondary';
 
 /**
  * Defines values for AppType.
- * Possible values include: 'developerPortal'
+ * Possible values include: 'portal', 'developerPortal'
  * @readonly
  * @enum {string}
  */
-export type AppType = 'developerPortal';
+export type AppType = 'portal' | 'developerPortal';
 
 /**
  * Defines values for Confirmation.
@@ -8501,11 +9168,11 @@ export type IdentityProviderType = 'facebook' | 'google' | 'microsoft' | 'twitte
 
 /**
  * Defines values for LoggerType.
- * Possible values include: 'azureEventHub', 'applicationInsights'
+ * Possible values include: 'azureEventHub', 'applicationInsights', 'azureMonitor'
  * @readonly
  * @enum {string}
  */
-export type LoggerType = 'azureEventHub' | 'applicationInsights';
+export type LoggerType = 'azureEventHub' | 'applicationInsights' | 'azureMonitor';
 
 /**
  * Defines values for ConnectivityStatusType.
@@ -8681,6 +9348,31 @@ export type ApiCreateOrUpdateResponse = ApiContract & ApiCreateOrUpdateHeaders &
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiUpdateResponse = ApiContract & ApiUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiContract;
+    };
+};
+
 /**
  * Contains response data for the listByTags operation.
  */
@@ -8866,6 +9558,31 @@ export type ApiReleaseCreateOrUpdateResponse = ApiReleaseContract & ApiReleaseCr
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiReleaseUpdateResponse = ApiReleaseContract & ApiReleaseUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiReleaseUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiReleaseContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -8971,6 +9688,31 @@ export type ApiOperationCreateOrUpdateResponse = OperationContract & ApiOperatio
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiOperationUpdateResponse = OperationContract & ApiOperationUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiOperationUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: OperationContract;
+    };
+};
+
 /**
  * Contains response data for the listByApiNext operation.
  */
@@ -9406,6 +10148,31 @@ export type TagCreateOrUpdateResponse = TagContract & TagCreateOrUpdateHeaders &
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type TagUpdateResponse = TagContract & TagUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: TagUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: TagContract;
+    };
+};
+
 /**
  * Contains response data for the listByOperationNext operation.
  */
@@ -9801,6 +10568,31 @@ export type ApiDiagnosticCreateOrUpdateResponse = DiagnosticContract & ApiDiagno
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiDiagnosticUpdateResponse = DiagnosticContract & ApiDiagnosticUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiDiagnosticUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: DiagnosticContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -9906,6 +10698,31 @@ export type ApiIssueCreateOrUpdateResponse = IssueContract & ApiIssueCreateOrUpd
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiIssueUpdateResponse = IssueContract & ApiIssueUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiIssueUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: IssueContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -10222,13 +11039,423 @@ export type ApiTagDescriptionCreateOrUpdateResponse = TagDescriptionContract & A
 };
 
 /**
- * Contains response data for the listByServiceNext operation.
+ * Contains response data for the listByServiceNext operation.
+ */
+export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: TagDescriptionCollection;
+    };
+};
+
+/**
+ * Contains response data for the listByTags operation.
+ */
+export type OperationListByTagsResponse = TagResourceCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: TagResourceCollection;
+    };
+};
+
+/**
+ * Contains response data for the listByTagsNext operation.
+ */
+export type OperationListByTagsNextResponse = TagResourceCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: TagResourceCollection;
+    };
+};
+
+/**
+ * Contains response data for the listByService operation.
+ */
+export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiVersionSetCollection;
+    };
+};
+
+/**
+ * Contains response data for the getEntityTag operation.
+ */
+export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiVersionSetGetEntityTagHeaders;
+    };
+};
+
+/**
+ * Contains response data for the get operation.
+ */
+export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiVersionSetGetHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiVersionSetContract;
+    };
+};
+
+/**
+ * Contains response data for the createOrUpdate operation.
+ */
+export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVersionSetCreateOrUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiVersionSetCreateOrUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiVersionSetContract;
+    };
+};
+
+/**
+ * Contains response data for the update operation.
+ */
+export type ApiVersionSetUpdateResponse = ApiVersionSetContract & ApiVersionSetUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ApiVersionSetUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiVersionSetContract;
+    };
+};
+
+/**
+ * Contains response data for the listByServiceNext operation.
+ */
+export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ApiVersionSetCollection;
+    };
+};
+
+/**
+ * Contains response data for the listByService operation.
+ */
+export type AuthorizationServerListByServiceResponse = AuthorizationServerCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerCollection;
+    };
+};
+
+/**
+ * Contains response data for the getEntityTag operation.
+ */
+export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEntityTagHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: AuthorizationServerGetEntityTagHeaders;
+    };
+};
+
+/**
+ * Contains response data for the get operation.
+ */
+export type AuthorizationServerGetResponse = AuthorizationServerContract & AuthorizationServerGetHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: AuthorizationServerGetHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerContract;
+    };
+};
+
+/**
+ * Contains response data for the createOrUpdate operation.
+ */
+export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContract & AuthorizationServerCreateOrUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: AuthorizationServerCreateOrUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerContract;
+    };
+};
+
+/**
+ * Contains response data for the update operation.
+ */
+export type AuthorizationServerUpdateResponse = AuthorizationServerContract & AuthorizationServerUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: AuthorizationServerUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerContract;
+    };
+};
+
+/**
+ * Contains response data for the listSecrets operation.
+ */
+export type AuthorizationServerListSecretsResponse = AuthorizationServerSecretsContract & AuthorizationServerListSecretsHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: AuthorizationServerListSecretsHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerSecretsContract;
+    };
+};
+
+/**
+ * Contains response data for the listByServiceNext operation.
+ */
+export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AuthorizationServerCollection;
+    };
+};
+
+/**
+ * Contains response data for the listByService operation.
+ */
+export type BackendListByServiceResponse = BackendCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: BackendCollection;
+    };
+};
+
+/**
+ * Contains response data for the getEntityTag operation.
+ */
+export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: BackendGetEntityTagHeaders;
+    };
+};
+
+/**
+ * Contains response data for the get operation.
+ */
+export type BackendGetResponse = BackendContract & BackendGetHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: BackendGetHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: BackendContract;
+    };
+};
+
+/**
+ * Contains response data for the createOrUpdate operation.
  */
-export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollection & {
+export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: BackendCreateOrUpdateHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -10237,18 +11464,23 @@ export type ApiTagDescriptionListByServiceNextResponse = TagDescriptionCollectio
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: TagDescriptionCollection;
+      parsedBody: BackendContract;
     };
 };
 
 /**
- * Contains response data for the listByTags operation.
+ * Contains response data for the update operation.
  */
-export type OperationListByTagsResponse = TagResourceCollection & {
+export type BackendUpdateResponse = BackendContract & BackendUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: BackendUpdateHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -10257,14 +11489,14 @@ export type OperationListByTagsResponse = TagResourceCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: TagResourceCollection;
+      parsedBody: BackendContract;
     };
 };
 
 /**
- * Contains response data for the listByTagsNext operation.
+ * Contains response data for the listByServiceNext operation.
  */
-export type OperationListByTagsNextResponse = TagResourceCollection & {
+export type BackendListByServiceNextResponse = BackendCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10277,14 +11509,14 @@ export type OperationListByTagsNextResponse = TagResourceCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: TagResourceCollection;
+      parsedBody: BackendCollection;
     };
 };
 
 /**
  * Contains response data for the listByService operation.
  */
-export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
+export type CacheListByServiceResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10297,14 +11529,14 @@ export type ApiVersionSetListByServiceResponse = ApiVersionSetCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApiVersionSetCollection;
+      parsedBody: CacheCollection;
     };
 };
 
 /**
  * Contains response data for the getEntityTag operation.
  */
-export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders & {
+export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10312,14 +11544,14 @@ export type ApiVersionSetGetEntityTagResponse = ApiVersionSetGetEntityTagHeaders
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: ApiVersionSetGetEntityTagHeaders;
+      parsedHeaders: CacheGetEntityTagHeaders;
     };
 };
 
 /**
  * Contains response data for the get operation.
  */
-export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetHeaders & {
+export type CacheGetResponse = CacheContract & CacheGetHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10327,7 +11559,7 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: ApiVersionSetGetHeaders;
+      parsedHeaders: CacheGetHeaders;
 
       /**
        * The response body as text (string format)
@@ -10337,14 +11569,14 @@ export type ApiVersionSetGetResponse = ApiVersionSetContract & ApiVersionSetGetH
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApiVersionSetContract;
+      parsedBody: CacheContract;
     };
 };
 
 /**
  * Contains response data for the createOrUpdate operation.
  */
-export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVersionSetCreateOrUpdateHeaders & {
+export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10352,7 +11584,7 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: ApiVersionSetCreateOrUpdateHeaders;
+      parsedHeaders: CacheCreateOrUpdateHeaders;
 
       /**
        * The response body as text (string format)
@@ -10362,18 +11594,23 @@ export type ApiVersionSetCreateOrUpdateResponse = ApiVersionSetContract & ApiVer
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApiVersionSetContract;
+      parsedBody: CacheContract;
     };
 };
 
 /**
- * Contains response data for the listByServiceNext operation.
+ * Contains response data for the update operation.
  */
-export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
+export type CacheUpdateResponse = CacheContract & CacheUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: CacheUpdateHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -10382,14 +11619,14 @@ export type ApiVersionSetListByServiceNextResponse = ApiVersionSetCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApiVersionSetCollection;
+      parsedBody: CacheContract;
     };
 };
 
 /**
- * Contains response data for the listByService operation.
+ * Contains response data for the listByServiceNext operation.
  */
-export type AuthorizationServerListByServiceResponse = AuthorizationServerCollection & {
+export type CacheListByServiceNextResponse = CacheCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10402,29 +11639,34 @@ export type AuthorizationServerListByServiceResponse = AuthorizationServerCollec
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AuthorizationServerCollection;
+      parsedBody: CacheCollection;
     };
 };
 
 /**
- * Contains response data for the getEntityTag operation.
+ * Contains response data for the listByService operation.
  */
-export type AuthorizationServerGetEntityTagResponse = AuthorizationServerGetEntityTagHeaders & {
+export type CertificateListByServiceResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
       /**
-       * The parsed HTTP response headers.
+       * The response body as text (string format)
        */
-      parsedHeaders: AuthorizationServerGetEntityTagHeaders;
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: CertificateCollection;
     };
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the getEntityTag operation.
  */
-export type AuthorizationServerGetResponse = AuthorizationServerContract & AuthorizationServerGetHeaders & {
+export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10432,24 +11674,14 @@ export type AuthorizationServerGetResponse = AuthorizationServerContract & Autho
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: AuthorizationServerGetHeaders;
-
-      /**
-       * The response body as text (string format)
-       */
-      bodyAsText: string;
-
-      /**
-       * The response body as parsed JSON or XML
-       */
-      parsedBody: AuthorizationServerContract;
+      parsedHeaders: CertificateGetEntityTagHeaders;
     };
 };
 
 /**
- * Contains response data for the createOrUpdate operation.
+ * Contains response data for the get operation.
  */
-export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContract & AuthorizationServerCreateOrUpdateHeaders & {
+export type CertificateGetResponse = CertificateContract & CertificateGetHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10457,7 +11689,7 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: AuthorizationServerCreateOrUpdateHeaders;
+      parsedHeaders: CertificateGetHeaders;
 
       /**
        * The response body as text (string format)
@@ -10467,18 +11699,23 @@ export type AuthorizationServerCreateOrUpdateResponse = AuthorizationServerContr
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AuthorizationServerContract;
+      parsedBody: CertificateContract;
     };
 };
 
 /**
- * Contains response data for the listSecrets operation.
+ * Contains response data for the createOrUpdate operation.
  */
-export type AuthorizationServerListSecretsResponse = ClientSecretContract & {
+export type CertificateCreateOrUpdateResponse = CertificateContract & CertificateCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: CertificateCreateOrUpdateHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -10487,14 +11724,14 @@ export type AuthorizationServerListSecretsResponse = ClientSecretContract & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ClientSecretContract;
+      parsedBody: CertificateContract;
     };
 };
 
 /**
  * Contains response data for the listByServiceNext operation.
  */
-export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCollection & {
+export type CertificateListByServiceNextResponse = CertificateCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10507,14 +11744,14 @@ export type AuthorizationServerListByServiceNextResponse = AuthorizationServerCo
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AuthorizationServerCollection;
+      parsedBody: CertificateCollection;
     };
 };
 
 /**
  * Contains response data for the listByService operation.
  */
-export type BackendListByServiceResponse = BackendCollection & {
+export type ContentTypeListByServiceResponse = ContentTypeCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10527,29 +11764,14 @@ export type BackendListByServiceResponse = BackendCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: BackendCollection;
-    };
-};
-
-/**
- * Contains response data for the getEntityTag operation.
- */
-export type BackendGetEntityTagResponse = BackendGetEntityTagHeaders & {
-  /**
-   * The underlying HTTP response.
-   */
-  _response: msRest.HttpResponse & {
-      /**
-       * The parsed HTTP response headers.
-       */
-      parsedHeaders: BackendGetEntityTagHeaders;
+      parsedBody: ContentTypeCollection;
     };
 };
 
 /**
  * Contains response data for the get operation.
  */
-export type BackendGetResponse = BackendContract & BackendGetHeaders & {
+export type ContentTypeGetResponse = ContentTypeContract & ContentTypeGetHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10557,7 +11779,7 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: BackendGetHeaders;
+      parsedHeaders: ContentTypeGetHeaders;
 
       /**
        * The response body as text (string format)
@@ -10567,14 +11789,14 @@ export type BackendGetResponse = BackendContract & BackendGetHeaders & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: BackendContract;
+      parsedBody: ContentTypeContract;
     };
 };
 
 /**
  * Contains response data for the createOrUpdate operation.
  */
-export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpdateHeaders & {
+export type ContentTypeCreateOrUpdateResponse = ContentTypeContract & ContentTypeCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10582,7 +11804,7 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: BackendCreateOrUpdateHeaders;
+      parsedHeaders: ContentTypeCreateOrUpdateHeaders;
 
       /**
        * The response body as text (string format)
@@ -10592,14 +11814,14 @@ export type BackendCreateOrUpdateResponse = BackendContract & BackendCreateOrUpd
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: BackendContract;
+      parsedBody: ContentTypeContract;
     };
 };
 
 /**
  * Contains response data for the listByServiceNext operation.
  */
-export type BackendListByServiceNextResponse = BackendCollection & {
+export type ContentTypeListByServiceNextResponse = ContentTypeCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10612,14 +11834,14 @@ export type BackendListByServiceNextResponse = BackendCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: BackendCollection;
+      parsedBody: ContentTypeCollection;
     };
 };
 
 /**
  * Contains response data for the listByService operation.
  */
-export type CacheListByServiceResponse = CacheCollection & {
+export type ContentTypeContentItemListByServiceResponse = ContentItemCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10632,14 +11854,14 @@ export type CacheListByServiceResponse = CacheCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CacheCollection;
+      parsedBody: ContentItemCollection;
     };
 };
 
 /**
  * Contains response data for the getEntityTag operation.
  */
-export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
+export type ContentTypeContentItemGetEntityTagResponse = ContentTypeContentItemGetEntityTagHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10647,14 +11869,14 @@ export type CacheGetEntityTagResponse = CacheGetEntityTagHeaders & {
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: CacheGetEntityTagHeaders;
+      parsedHeaders: ContentTypeContentItemGetEntityTagHeaders;
     };
 };
 
 /**
  * Contains response data for the get operation.
  */
-export type CacheGetResponse = CacheContract & CacheGetHeaders & {
+export type ContentTypeContentItemGetResponse = ContentItemContract & ContentTypeContentItemGetHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10662,7 +11884,7 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: CacheGetHeaders;
+      parsedHeaders: ContentTypeContentItemGetHeaders;
 
       /**
        * The response body as text (string format)
@@ -10672,14 +11894,14 @@ export type CacheGetResponse = CacheContract & CacheGetHeaders & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CacheContract;
+      parsedBody: ContentItemContract;
     };
 };
 
 /**
  * Contains response data for the createOrUpdate operation.
  */
-export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHeaders & {
+export type ContentTypeContentItemCreateOrUpdateResponse = ContentItemContract & ContentTypeContentItemCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -10687,7 +11909,7 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: CacheCreateOrUpdateHeaders;
+      parsedHeaders: ContentTypeContentItemCreateOrUpdateHeaders;
 
       /**
        * The response body as text (string format)
@@ -10697,14 +11919,14 @@ export type CacheCreateOrUpdateResponse = CacheContract & CacheCreateOrUpdateHea
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CacheContract;
+      parsedBody: ContentItemContract;
     };
 };
 
 /**
  * Contains response data for the listByServiceNext operation.
  */
-export type CacheListByServiceNextResponse = CacheCollection & {
+export type ContentTypeContentItemListByServiceNextResponse = ContentItemCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10717,14 +11939,14 @@ export type CacheListByServiceNextResponse = CacheCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CacheCollection;
+      parsedBody: ContentItemCollection;
     };
 };
 
 /**
- * Contains response data for the listByService operation.
+ * Contains response data for the listBySubscription operation.
  */
-export type CertificateListByServiceResponse = CertificateCollection & {
+export type DeletedServicesListBySubscriptionResponse = DeletedServicesCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10737,38 +11959,18 @@ export type CertificateListByServiceResponse = CertificateCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CertificateCollection;
-    };
-};
-
-/**
- * Contains response data for the getEntityTag operation.
- */
-export type CertificateGetEntityTagResponse = CertificateGetEntityTagHeaders & {
-  /**
-   * The underlying HTTP response.
-   */
-  _response: msRest.HttpResponse & {
-      /**
-       * The parsed HTTP response headers.
-       */
-      parsedHeaders: CertificateGetEntityTagHeaders;
+      parsedBody: DeletedServicesCollection;
     };
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the getByName operation.
  */
-export type CertificateGetResponse = CertificateContract & CertificateGetHeaders & {
+export type DeletedServicesGetByNameResponse = DeletedServiceContract & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
-      /**
-       * The parsed HTTP response headers.
-       */
-      parsedHeaders: CertificateGetHeaders;
-
       /**
        * The response body as text (string format)
        */
@@ -10777,23 +11979,18 @@ export type CertificateGetResponse = CertificateContract & CertificateGetHeaders
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CertificateContract;
+      parsedBody: DeletedServiceContract;
     };
 };
 
 /**
- * Contains response data for the createOrUpdate operation.
+ * Contains response data for the purge operation.
  */
-export type CertificateCreateOrUpdateResponse = CertificateContract & CertificateCreateOrUpdateHeaders & {
+export type DeletedServicesPurgeResponse = DeletedServiceContract & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
-      /**
-       * The parsed HTTP response headers.
-       */
-      parsedHeaders: CertificateCreateOrUpdateHeaders;
-
       /**
        * The response body as text (string format)
        */
@@ -10802,14 +11999,14 @@ export type CertificateCreateOrUpdateResponse = CertificateContract & Certificat
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CertificateContract;
+      parsedBody: DeletedServiceContract;
     };
 };
 
 /**
- * Contains response data for the listByServiceNext operation.
+ * Contains response data for the listBySubscriptionNext operation.
  */
-export type CertificateListByServiceNextResponse = CertificateCollection & {
+export type DeletedServicesListBySubscriptionNextResponse = DeletedServicesCollection & {
   /**
    * The underlying HTTP response.
    */
@@ -10822,7 +12019,7 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: CertificateCollection;
+      parsedBody: DeletedServicesCollection;
     };
 };
 
@@ -11371,6 +12568,31 @@ export type DiagnosticCreateOrUpdateResponse = DiagnosticContract & DiagnosticCr
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type DiagnosticUpdateResponse = DiagnosticContract & DiagnosticUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: DiagnosticUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: DiagnosticContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -11471,6 +12693,31 @@ export type EmailTemplateCreateOrUpdateResponse = EmailTemplateContract & {
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type EmailTemplateUpdateResponse = EmailTemplateContract & EmailTemplateUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: EmailTemplateUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: EmailTemplateContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -11520,16 +12767,41 @@ export type GatewayGetEntityTagResponse = GatewayGetEntityTagHeaders & {
    */
   _response: msRest.HttpResponse & {
       /**
-       * The parsed HTTP response headers.
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: GatewayGetEntityTagHeaders;
+    };
+};
+
+/**
+ * Contains response data for the get operation.
+ */
+export type GatewayGetResponse = GatewayContract & GatewayGetHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: GatewayGetHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
        */
-      parsedHeaders: GatewayGetEntityTagHeaders;
+      parsedBody: GatewayContract;
     };
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the createOrUpdate operation.
  */
-export type GatewayGetResponse = GatewayContract & GatewayGetHeaders & {
+export type GatewayCreateOrUpdateResponse = GatewayContract & GatewayCreateOrUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -11537,7 +12809,7 @@ export type GatewayGetResponse = GatewayContract & GatewayGetHeaders & {
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: GatewayGetHeaders;
+      parsedHeaders: GatewayCreateOrUpdateHeaders;
 
       /**
        * The response body as text (string format)
@@ -11552,9 +12824,9 @@ export type GatewayGetResponse = GatewayContract & GatewayGetHeaders & {
 };
 
 /**
- * Contains response data for the createOrUpdate operation.
+ * Contains response data for the update operation.
  */
-export type GatewayCreateOrUpdateResponse = GatewayContract & GatewayCreateOrUpdateHeaders & {
+export type GatewayUpdateResponse = GatewayContract & GatewayUpdateHeaders & {
   /**
    * The underlying HTTP response.
    */
@@ -11562,7 +12834,7 @@ export type GatewayCreateOrUpdateResponse = GatewayContract & GatewayCreateOrUpd
       /**
        * The parsed HTTP response headers.
        */
-      parsedHeaders: GatewayCreateOrUpdateHeaders;
+      parsedHeaders: GatewayUpdateHeaders;
 
       /**
        * The response body as text (string format)
@@ -11906,6 +13178,31 @@ export type GroupCreateOrUpdateResponse = GroupContract & GroupCreateOrUpdateHea
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type GroupUpdateResponse = GroupContract & GroupUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: GroupUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: GroupContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -12096,14 +13393,44 @@ export type IdentityProviderCreateOrUpdateResponse = IdentityProviderContract &
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type IdentityProviderUpdateResponse = IdentityProviderContract & IdentityProviderUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: IdentityProviderUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: IdentityProviderContract;
+    };
+};
+
 /**
  * Contains response data for the listSecrets operation.
  */
-export type IdentityProviderListSecretsResponse = ClientSecretContract & {
+export type IdentityProviderListSecretsResponse = ClientSecretContract & IdentityProviderListSecretsHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: IdentityProviderListSecretsHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -12286,6 +13613,31 @@ export type LoggerCreateOrUpdateResponse = LoggerContract & LoggerCreateOrUpdate
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type LoggerUpdateResponse = LoggerContract & LoggerUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: LoggerUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: LoggerContract;
+    };
+};
+
 /**
  * Contains response data for the listByServiceNext operation.
  */
@@ -12419,11 +13771,16 @@ export type NamedValueUpdateResponse = NamedValueContract & NamedValueUpdateHead
 /**
  * Contains response data for the listValue operation.
  */
-export type NamedValueListValueResponse = PropertyValueContract & {
+export type NamedValueListValueResponse = NamedValueSecretContract & NamedValueListValueHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: NamedValueListValueHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -12432,7 +13789,7 @@ export type NamedValueListValueResponse = PropertyValueContract & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: PropertyValueContract;
+      parsedBody: NamedValueSecretContract;
     };
 };
 
@@ -12791,14 +14148,44 @@ export type OpenIdConnectProviderCreateOrUpdateResponse = OpenidConnectProviderC
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type OpenIdConnectProviderUpdateResponse = OpenidConnectProviderContract & OpenIdConnectProviderUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: OpenIdConnectProviderUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: OpenidConnectProviderContract;
+    };
+};
+
 /**
  * Contains response data for the listSecrets operation.
  */
-export type OpenIdConnectProviderListSecretsResponse = ClientSecretContract & {
+export type OpenIdConnectProviderListSecretsResponse = ClientSecretContract & OpenIdConnectProviderListSecretsHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: OpenIdConnectProviderListSecretsHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -13221,6 +14608,31 @@ export type ProductCreateOrUpdateResponse = ProductContract & ProductCreateOrUpd
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type ProductUpdateResponse = ProductContract & ProductUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: ProductUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ProductContract;
+    };
+};
+
 /**
  * Contains response data for the listByTags operation.
  */
@@ -13546,6 +14958,26 @@ export type QuotaByCounterKeysListByServiceResponse = QuotaCounterCollection & {
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type QuotaByCounterKeysUpdateResponse = QuotaCounterCollection & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: QuotaCounterCollection;
+    };
+};
+
 /**
  * Contains response data for the get operation.
  */
@@ -13566,6 +14998,26 @@ export type QuotaByPeriodKeysGetResponse = QuotaCounterContract & {
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type QuotaByPeriodKeysUpdateResponse = QuotaCounterContract & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: QuotaCounterContract;
+    };
+};
+
 /**
  * Contains response data for the listByService operation.
  */
@@ -13991,14 +15443,44 @@ export type SubscriptionCreateOrUpdateResponse = SubscriptionContract & Subscrip
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type SubscriptionUpdateResponse = SubscriptionContract & SubscriptionUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: SubscriptionUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: SubscriptionContract;
+    };
+};
+
 /**
  * Contains response data for the listSecrets operation.
  */
-export type SubscriptionListSecretsResponse = SubscriptionKeysContract & {
+export type SubscriptionListSecretsResponse = SubscriptionKeysContract & SubscriptionListSecretsHeaders & {
   /**
    * The underlying HTTP response.
    */
   _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: SubscriptionListSecretsHeaders;
+
       /**
        * The response body as text (string format)
        */
@@ -14111,6 +15593,31 @@ export type TenantAccessGetResponse = AccessInformationContract & TenantAccessGe
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type TenantAccessUpdateResponse = AccessInformationContract & TenantAccessUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: TenantAccessUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: AccessInformationContract;
+    };
+};
+
 /**
  * Contains response data for the listSecrets operation.
  */
@@ -14411,6 +15918,31 @@ export type UserCreateOrUpdateResponse = UserContract & UserCreateOrUpdateHeader
     };
 };
 
+/**
+ * Contains response data for the update operation.
+ */
+export type UserUpdateResponse = UserContract & UserUpdateHeaders & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The parsed HTTP response headers.
+       */
+      parsedHeaders: UserUpdateHeaders;
+
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: UserContract;
+    };
+};
+
 /**
  * Contains response data for the generateSsoUrl operation.
  */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
index 997f8c08da60..9421e0251964 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -54,6 +57,9 @@ export {
   IssueCommentContract,
   IssueContract,
   IssueGetHeaders,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
index f6fa57322949..ecc6d3beea3f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,12 +55,16 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerCollection,
   LoggerContract,
   LoggerCreateOrUpdateHeaders,
   LoggerGetEntityTagHeaders,
   LoggerGetHeaders,
   LoggerUpdateContract,
+  LoggerUpdateHeaders,
   NamedValueContract,
   NamedValueCreateContract,
   NotificationContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 76d5c775cee6..e5f012f276db 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -1010,12 +1010,13 @@ export const IssueContractBaseProperties: msRest.CompositeMapper = {
   }
 };
 
-export const IssueUpdateContract: msRest.CompositeMapper = {
-  serializedName: "IssueUpdateContract",
+export const IssueContract: msRest.CompositeMapper = {
+  serializedName: "IssueContract",
   type: {
     name: "Composite",
-    className: "IssueUpdateContract",
+    className: "IssueContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       createdDate: {
         serializedName: "properties.createdDate",
         type: {
@@ -1035,18 +1036,21 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
         }
       },
       title: {
+        required: true,
         serializedName: "properties.title",
         type: {
           name: "String"
         }
       },
       description: {
+        required: true,
         serializedName: "properties.description",
         type: {
           name: "String"
         }
       },
       userId: {
+        required: true,
         serializedName: "properties.userId",
         type: {
           name: "String"
@@ -1056,13 +1060,12 @@ export const IssueUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const IssueContract: msRest.CompositeMapper = {
-  serializedName: "IssueContract",
+export const IssueUpdateContract: msRest.CompositeMapper = {
+  serializedName: "IssueUpdateContract",
   type: {
     name: "Composite",
-    className: "IssueContract",
+    className: "IssueUpdateContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
       createdDate: {
         serializedName: "properties.createdDate",
         type: {
@@ -1082,21 +1085,18 @@ export const IssueContract: msRest.CompositeMapper = {
         }
       },
       title: {
-        required: true,
         serializedName: "properties.title",
         type: {
           name: "String"
         }
       },
       description: {
-        required: true,
         serializedName: "properties.description",
         type: {
           name: "String"
         }
       },
       userId: {
-        required: true,
         serializedName: "properties.userId",
         type: {
           name: "String"
@@ -1261,6 +1261,12 @@ export const DiagnosticContract: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      operationNameFormat: {
+        serializedName: "properties.operationNameFormat",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -1670,12 +1676,13 @@ export const OperationEntityBaseContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationUpdateContract: msRest.CompositeMapper = {
-  serializedName: "OperationUpdateContract",
+export const OperationContract: msRest.CompositeMapper = {
+  serializedName: "OperationContract",
   type: {
     name: "Composite",
-    className: "OperationUpdateContract",
+    className: "OperationContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       templateParameters: {
         serializedName: "properties.templateParameters",
         type: {
@@ -1723,6 +1730,7 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
         }
       },
       displayName: {
+        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 300,
@@ -1733,12 +1741,14 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
         }
       },
       method: {
+        required: true,
         serializedName: "properties.method",
         type: {
           name: "String"
         }
       },
       urlTemplate: {
+        required: true,
         serializedName: "properties.urlTemplate",
         constraints: {
           MaxLength: 1000,
@@ -1752,13 +1762,12 @@ export const OperationUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationContract: msRest.CompositeMapper = {
-  serializedName: "OperationContract",
+export const OperationUpdateContract: msRest.CompositeMapper = {
+  serializedName: "OperationUpdateContract",
   type: {
     name: "Composite",
-    className: "OperationContract",
+    className: "OperationUpdateContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
       templateParameters: {
         serializedName: "properties.templateParameters",
         type: {
@@ -1806,7 +1815,6 @@ export const OperationContract: msRest.CompositeMapper = {
         }
       },
       displayName: {
-        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 300,
@@ -1817,14 +1825,12 @@ export const OperationContract: msRest.CompositeMapper = {
         }
       },
       method: {
-        required: true,
         serializedName: "properties.method",
         type: {
           name: "String"
         }
       },
       urlTemplate: {
-        required: true,
         serializedName: "properties.urlTemplate",
         constraints: {
           MaxLength: 1000,
@@ -1948,12 +1954,13 @@ export const ApiRevisionContract: msRest.CompositeMapper = {
   }
 };
 
-export const ApiUpdateContract: msRest.CompositeMapper = {
-  serializedName: "ApiUpdateContract",
+export const ApiContract: msRest.CompositeMapper = {
+  serializedName: "ApiContract",
   type: {
     name: "Composite",
-    className: "ApiUpdateContract",
+    className: "ApiContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         type: {
@@ -2042,6 +2049,12 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
           name: "Boolean"
         }
       },
+      sourceApiId: {
+        serializedName: "properties.sourceApiId",
+        type: {
+          name: "String"
+        }
+      },
       displayName: {
         serializedName: "properties.displayName",
         constraints: {
@@ -2056,13 +2069,14 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
         serializedName: "properties.serviceUrl",
         constraints: {
           MaxLength: 2000,
-          MinLength: 1
+          MinLength: 0
         },
         type: {
           name: "String"
         }
       },
       path: {
+        required: true,
         serializedName: "properties.path",
         constraints: {
           MaxLength: 400,
@@ -2086,18 +2100,24 @@ export const ApiUpdateContract: msRest.CompositeMapper = {
             }
           }
         }
+      },
+      apiVersionSet: {
+        serializedName: "properties.apiVersionSet",
+        type: {
+          name: "Composite",
+          className: "ApiVersionSetContractDetails"
+        }
       }
     }
   }
 };
 
-export const ApiContract: msRest.CompositeMapper = {
-  serializedName: "ApiContract",
+export const ApiUpdateContract: msRest.CompositeMapper = {
+  serializedName: "ApiUpdateContract",
   type: {
     name: "Composite",
-    className: "ApiContract",
+    className: "ApiUpdateContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         type: {
@@ -2186,12 +2206,6 @@ export const ApiContract: msRest.CompositeMapper = {
           name: "Boolean"
         }
       },
-      sourceApiId: {
-        serializedName: "properties.sourceApiId",
-        type: {
-          name: "String"
-        }
-      },
       displayName: {
         serializedName: "properties.displayName",
         constraints: {
@@ -2206,14 +2220,13 @@ export const ApiContract: msRest.CompositeMapper = {
         serializedName: "properties.serviceUrl",
         constraints: {
           MaxLength: 2000,
-          MinLength: 0
+          MinLength: 1
         },
         type: {
           name: "String"
         }
       },
       path: {
-        required: true,
         serializedName: "properties.path",
         constraints: {
           MaxLength: 400,
@@ -2237,13 +2250,6 @@ export const ApiContract: msRest.CompositeMapper = {
             }
           }
         }
-      },
-      apiVersionSet: {
-        serializedName: "properties.apiVersionSet",
-        type: {
-          name: "Composite",
-          className: "ApiVersionSetContractDetails"
-        }
       }
     }
   }
@@ -2467,12 +2473,13 @@ export const ApiVersionSetEntityBase: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "ApiVersionSetUpdateParameters",
+export const ApiVersionSetContract: msRest.CompositeMapper = {
+  serializedName: "ApiVersionSetContract",
   type: {
     name: "Composite",
-    className: "ApiVersionSetUpdateParameters",
+    className: "ApiVersionSetContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         type: {
@@ -2500,6 +2507,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
         }
       },
       displayName: {
+        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 100,
@@ -2510,6 +2518,7 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
         }
       },
       versioningScheme: {
+        required: true,
         serializedName: "properties.versioningScheme",
         type: {
           name: "String"
@@ -2519,13 +2528,12 @@ export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiVersionSetContract: msRest.CompositeMapper = {
-  serializedName: "ApiVersionSetContract",
+export const ApiVersionSetUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "ApiVersionSetUpdateParameters",
   type: {
     name: "Composite",
-    className: "ApiVersionSetContract",
+    className: "ApiVersionSetUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         type: {
@@ -2553,7 +2561,6 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
         }
       },
       displayName: {
-        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 100,
@@ -2564,7 +2571,6 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
         }
       },
       versioningScheme: {
-        required: true,
         serializedName: "properties.versioningScheme",
         type: {
           name: "String"
@@ -2574,17 +2580,29 @@ export const ApiVersionSetContract: msRest.CompositeMapper = {
   }
 };
 
-export const ClientSecretContract: msRest.CompositeMapper = {
-  serializedName: "ClientSecretContract",
+export const AuthorizationServerSecretsContract: msRest.CompositeMapper = {
+  serializedName: "AuthorizationServerSecretsContract",
   type: {
     name: "Composite",
-    className: "ClientSecretContract",
+    className: "AuthorizationServerSecretsContract",
     modelProperties: {
       clientSecret: {
         serializedName: "clientSecret",
         type: {
           name: "String"
         }
+      },
+      resourceOwnerUsername: {
+        serializedName: "resourceOwnerUsername",
+        type: {
+          name: "String"
+        }
+      },
+      resourceOwnerPassword: {
+        serializedName: "resourceOwnerPassword",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -2715,11 +2733,11 @@ export const AuthorizationServerContractBaseProperties: msRest.CompositeMapper =
   }
 };
 
-export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
-  serializedName: "AuthorizationServerUpdateContract",
+export const AuthorizationServerContract: msRest.CompositeMapper = {
+  serializedName: "AuthorizationServerContract",
   type: {
     name: "Composite",
-    className: "AuthorizationServerUpdateContract",
+    className: "AuthorizationServerContract",
     modelProperties: {
       ...Resource.type.modelProperties,
       description: {
@@ -2814,6 +2832,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
         }
       },
       displayName: {
+        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 50,
@@ -2824,18 +2843,21 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
         }
       },
       clientRegistrationEndpoint: {
+        required: true,
         serializedName: "properties.clientRegistrationEndpoint",
         type: {
           name: "String"
         }
       },
       authorizationEndpoint: {
+        required: true,
         serializedName: "properties.authorizationEndpoint",
         type: {
           name: "String"
         }
       },
       grantTypes: {
+        required: true,
         serializedName: "properties.grantTypes",
         type: {
           name: "Sequence",
@@ -2847,6 +2869,7 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
         }
       },
       clientId: {
+        required: true,
         serializedName: "properties.clientId",
         type: {
           name: "String"
@@ -2862,11 +2885,11 @@ export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const AuthorizationServerContract: msRest.CompositeMapper = {
-  serializedName: "AuthorizationServerContract",
+export const AuthorizationServerUpdateContract: msRest.CompositeMapper = {
+  serializedName: "AuthorizationServerUpdateContract",
   type: {
     name: "Composite",
-    className: "AuthorizationServerContract",
+    className: "AuthorizationServerUpdateContract",
     modelProperties: {
       ...Resource.type.modelProperties,
       description: {
@@ -2961,7 +2984,6 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
         }
       },
       displayName: {
-        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 50,
@@ -2972,21 +2994,18 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
         }
       },
       clientRegistrationEndpoint: {
-        required: true,
         serializedName: "properties.clientRegistrationEndpoint",
         type: {
           name: "String"
         }
       },
       authorizationEndpoint: {
-        required: true,
         serializedName: "properties.authorizationEndpoint",
         type: {
           name: "String"
         }
       },
       grantTypes: {
-        required: true,
         serializedName: "properties.grantTypes",
         type: {
           name: "Sequence",
@@ -2998,7 +3017,6 @@ export const AuthorizationServerContract: msRest.CompositeMapper = {
         }
       },
       clientId: {
-        required: true,
         serializedName: "properties.clientId",
         type: {
           name: "String"
@@ -3348,12 +3366,13 @@ export const BackendBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "BackendUpdateParameters",
+export const BackendContract: msRest.CompositeMapper = {
+  serializedName: "BackendContract",
   type: {
     name: "Composite",
-    className: "BackendUpdateParameters",
+    className: "BackendContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       title: {
         serializedName: "properties.title",
         constraints: {
@@ -3413,6 +3432,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
         }
       },
       url: {
+        required: true,
         serializedName: "properties.url",
         constraints: {
           MaxLength: 2000,
@@ -3423,6 +3443,7 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
         }
       },
       protocol: {
+        required: true,
         serializedName: "properties.protocol",
         type: {
           name: "String"
@@ -3432,13 +3453,12 @@ export const BackendUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const BackendContract: msRest.CompositeMapper = {
-  serializedName: "BackendContract",
+export const BackendUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "BackendUpdateParameters",
   type: {
     name: "Composite",
-    className: "BackendContract",
+    className: "BackendUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
       title: {
         serializedName: "properties.title",
         constraints: {
@@ -3498,7 +3518,6 @@ export const BackendContract: msRest.CompositeMapper = {
         }
       },
       url: {
-        required: true,
         serializedName: "properties.url",
         constraints: {
           MaxLength: 2000,
@@ -3509,7 +3528,6 @@ export const BackendContract: msRest.CompositeMapper = {
         }
       },
       protocol: {
-        required: true,
         serializedName: "properties.protocol",
         type: {
           name: "String"
@@ -3519,12 +3537,13 @@ export const BackendContract: msRest.CompositeMapper = {
   }
 };
 
-export const CacheUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "CacheUpdateParameters",
+export const CacheContract: msRest.CompositeMapper = {
+  serializedName: "CacheContract",
   type: {
     name: "Composite",
-    className: "CacheUpdateParameters",
+    className: "CacheContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         constraints: {
@@ -3535,6 +3554,7 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
         }
       },
       connectionString: {
+        required: true,
         serializedName: "properties.connectionString",
         constraints: {
           MaxLength: 300
@@ -3556,13 +3576,12 @@ export const CacheUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const CacheContract: msRest.CompositeMapper = {
-  serializedName: "CacheContract",
+export const CacheUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "CacheUpdateParameters",
   type: {
     name: "Composite",
-    className: "CacheContract",
+    className: "CacheUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
       description: {
         serializedName: "properties.description",
         constraints: {
@@ -3573,7 +3592,6 @@ export const CacheContract: msRest.CompositeMapper = {
         }
       },
       connectionString: {
-        required: true,
         serializedName: "properties.connectionString",
         constraints: {
           MaxLength: 300
@@ -3641,7 +3659,6 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
         }
       },
       password: {
-        required: true,
         serializedName: "properties.password",
         type: {
           name: "String"
@@ -3651,6 +3668,105 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
+export const ContentItemContract: msRest.CompositeMapper = {
+  serializedName: "ContentItemContract",
+  type: {
+    name: "Composite",
+    className: "ContentItemContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      properties: {
+        serializedName: "properties",
+        type: {
+          name: "Dictionary",
+          value: {
+            type: {
+              name: "Object"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeContract: msRest.CompositeMapper = {
+  serializedName: "ContentTypeContract",
+  type: {
+    name: "Composite",
+    className: "ContentTypeContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      contentTypeContractId: {
+        serializedName: "properties.id",
+        type: {
+          name: "String"
+        }
+      },
+      contentTypeContractName: {
+        serializedName: "properties.name",
+        type: {
+          name: "String"
+        }
+      },
+      description: {
+        serializedName: "properties.description",
+        type: {
+          name: "String"
+        }
+      },
+      schema: {
+        serializedName: "properties.schema",
+        type: {
+          name: "Object"
+        }
+      },
+      version: {
+        serializedName: "properties.version",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const DeletedServiceContract: msRest.CompositeMapper = {
+  serializedName: "DeletedServiceContract",
+  type: {
+    name: "Composite",
+    className: "DeletedServiceContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      serviceId: {
+        serializedName: "properties.serviceId",
+        type: {
+          name: "String"
+        }
+      },
+      scheduledPurgeDate: {
+        serializedName: "properties.scheduledPurgeDate",
+        type: {
+          name: "DateTime"
+        }
+      },
+      deletionDate: {
+        serializedName: "properties.deletionDate",
+        type: {
+          name: "DateTime"
+        }
+      },
+      location: {
+        readOnly: true,
+        serializedName: "location",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ResourceSku: msRest.CompositeMapper = {
   serializedName: "ResourceSku",
   type: {
@@ -3946,7 +4062,18 @@ export const AdditionalLocation: msRest.CompositeMapper = {
           className: "ApiManagementServiceSkuProperties"
         }
       },
-      publicIPAddresses: {
+      zones: {
+        serializedName: "zones",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      publicIPAddresses: {
         readOnly: true,
         serializedName: "publicIPAddresses",
         type: {
@@ -4232,6 +4359,13 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
           name: "Composite",
           className: "ApiVersionConstraint"
         }
+      },
+      restore: {
+        serializedName: "restore",
+        defaultValue: false,
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -4529,6 +4663,13 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
           className: "ApiVersionConstraint"
         }
       },
+      restore: {
+        serializedName: "properties.restore",
+        defaultValue: false,
+        type: {
+          name: "Boolean"
+        }
+      },
       publisherEmail: {
         required: true,
         serializedName: "properties.publisherEmail",
@@ -4577,6 +4718,17 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      zones: {
+        serializedName: "zones",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
       }
     }
   }
@@ -4767,6 +4919,13 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
           className: "ApiVersionConstraint"
         }
       },
+      restore: {
+        serializedName: "properties.restore",
+        defaultValue: false,
+        type: {
+          name: "Boolean"
+        }
+      },
       publisherEmail: {
         serializedName: "properties.publisherEmail",
         constraints: {
@@ -5005,13 +5164,15 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "EmailTemplateUpdateParameters",
+export const EmailTemplateContract: msRest.CompositeMapper = {
+  serializedName: "EmailTemplateContract",
   type: {
     name: "Composite",
-    className: "EmailTemplateUpdateParameters",
+    className: "EmailTemplateContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       subject: {
+        required: true,
         serializedName: "properties.subject",
         constraints: {
           MaxLength: 1000,
@@ -5021,6 +5182,16 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
+      body: {
+        required: true,
+        serializedName: "properties.body",
+        constraints: {
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
       title: {
         serializedName: "properties.title",
         type: {
@@ -5033,13 +5204,11 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      body: {
-        serializedName: "properties.body",
-        constraints: {
-          MinLength: 1
-        },
+      isDefault: {
+        readOnly: true,
+        serializedName: "properties.isDefault",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
       parameters: {
@@ -5058,15 +5227,13 @@ export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
-  serializedName: "EmailTemplateContract",
+export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "EmailTemplateUpdateParameters",
   type: {
     name: "Composite",
-    className: "EmailTemplateContract",
+    className: "EmailTemplateUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
       subject: {
-        required: true,
         serializedName: "properties.subject",
         constraints: {
           MaxLength: 1000,
@@ -5076,16 +5243,6 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      body: {
-        required: true,
-        serializedName: "properties.body",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
       title: {
         serializedName: "properties.title",
         type: {
@@ -5098,11 +5255,13 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      isDefault: {
-        readOnly: true,
-        serializedName: "properties.isDefault",
+      body: {
+        serializedName: "properties.body",
+        constraints: {
+          MinLength: 1
+        },
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
       parameters: {
@@ -5165,6 +5324,24 @@ export const GatewayHostnameConfigurationContract: msRest.CompositeMapper = {
         type: {
           name: "Boolean"
         }
+      },
+      tls10Enabled: {
+        serializedName: "properties.tls10Enabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      tls11Enabled: {
+        serializedName: "properties.tls11Enabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      http2Enabled: {
+        serializedName: "properties.http2Enabled",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -5516,13 +5693,15 @@ export const UserContract: msRest.CompositeMapper = {
   }
 };
 
-export const GroupUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "GroupUpdateParameters",
+export const GroupContract: msRest.CompositeMapper = {
+  serializedName: "GroupContract",
   type: {
     name: "Composite",
-    className: "GroupUpdateParameters",
+    className: "GroupContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       displayName: {
+        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 300,
@@ -5534,11 +5713,21 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
       },
       description: {
         serializedName: "properties.description",
+        constraints: {
+          MaxLength: 1000
+        },
         type: {
           name: "String"
         }
       },
-      type: {
+      builtIn: {
+        readOnly: true,
+        serializedName: "properties.builtIn",
+        type: {
+          name: "Boolean"
+        }
+      },
+      groupContractType: {
         serializedName: "properties.type",
         type: {
           name: "Enum",
@@ -5559,15 +5748,13 @@ export const GroupUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const GroupContract: msRest.CompositeMapper = {
-  serializedName: "GroupContract",
+export const GroupUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
-    className: "GroupContract",
+    className: "GroupUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
       displayName: {
-        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 300,
@@ -5579,21 +5766,11 @@ export const GroupContract: msRest.CompositeMapper = {
       },
       description: {
         serializedName: "properties.description",
-        constraints: {
-          MaxLength: 1000
-        },
         type: {
           name: "String"
         }
       },
-      builtIn: {
-        readOnly: true,
-        serializedName: "properties.builtIn",
-        type: {
-          name: "Boolean"
-        }
-      },
-      groupContractType: {
+      type: {
         serializedName: "properties.type",
         type: {
           name: "Enum",
@@ -5658,6 +5835,22 @@ export const GroupCreateParameters: msRest.CompositeMapper = {
   }
 };
 
+export const ClientSecretContract: msRest.CompositeMapper = {
+  serializedName: "ClientSecretContract",
+  type: {
+    name: "Composite",
+    className: "ClientSecretContract",
+    modelProperties: {
+      clientSecret: {
+        serializedName: "clientSecret",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   serializedName: "IdentityProviderBaseParameters",
   type: {
@@ -5736,13 +5929,14 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderUpdateParameters",
+export const IdentityProviderContract: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
-    className: "IdentityProviderUpdateParameters",
+    className: "IdentityProviderContract",
     modelProperties: {
-      type: {
+      ...Resource.type.modelProperties,
+      identityProviderContractType: {
         serializedName: "properties.type",
         type: {
           name: "String"
@@ -5811,6 +6005,7 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
         }
       },
       clientId: {
+        required: true,
         serializedName: "properties.clientId",
         constraints: {
           MinLength: 1
@@ -5832,14 +6027,13 @@ export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderContract",
+export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
-    className: "IdentityProviderContract",
+    className: "IdentityProviderUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      identityProviderContractType: {
+      type: {
         serializedName: "properties.type",
         type: {
           name: "String"
@@ -5908,7 +6102,6 @@ export const IdentityProviderContract: msRest.CompositeMapper = {
         }
       },
       clientId: {
-        required: true,
         serializedName: "properties.clientId",
         constraints: {
           MinLength: 1
@@ -6029,13 +6222,15 @@ export const IdentityProviderCreateContract: msRest.CompositeMapper = {
   }
 };
 
-export const LoggerUpdateContract: msRest.CompositeMapper = {
-  serializedName: "LoggerUpdateContract",
+export const LoggerContract: msRest.CompositeMapper = {
+  serializedName: "LoggerContract",
   type: {
     name: "Composite",
-    className: "LoggerUpdateContract",
+    className: "LoggerContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       loggerType: {
+        required: true,
         serializedName: "properties.loggerType",
         type: {
           name: "String"
@@ -6043,6 +6238,9 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
       },
       description: {
         serializedName: "properties.description",
+        constraints: {
+          MaxLength: 256
+        },
         type: {
           name: "String"
         }
@@ -6063,20 +6261,24 @@ export const LoggerUpdateContract: msRest.CompositeMapper = {
         type: {
           name: "Boolean"
         }
+      },
+      resourceId: {
+        serializedName: "properties.resourceId",
+        type: {
+          name: "String"
+        }
       }
     }
   }
 };
 
-export const LoggerContract: msRest.CompositeMapper = {
-  serializedName: "LoggerContract",
+export const LoggerUpdateContract: msRest.CompositeMapper = {
+  serializedName: "LoggerUpdateContract",
   type: {
     name: "Composite",
-    className: "LoggerContract",
+    className: "LoggerUpdateContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
       loggerType: {
-        required: true,
         serializedName: "properties.loggerType",
         type: {
           name: "String"
@@ -6084,15 +6286,11 @@ export const LoggerContract: msRest.CompositeMapper = {
       },
       description: {
         serializedName: "properties.description",
-        constraints: {
-          MaxLength: 256
-        },
         type: {
           name: "String"
         }
       },
       credentials: {
-        required: true,
         serializedName: "properties.credentials",
         type: {
           name: "Dictionary",
@@ -6108,22 +6306,16 @@ export const LoggerContract: msRest.CompositeMapper = {
         type: {
           name: "Boolean"
         }
-      },
-      resourceId: {
-        serializedName: "properties.resourceId",
-        type: {
-          name: "String"
-        }
       }
     }
   }
 };
 
-export const PropertyValueContract: msRest.CompositeMapper = {
-  serializedName: "PropertyValueContract",
+export const NamedValueSecretContract: msRest.CompositeMapper = {
+  serializedName: "NamedValueSecretContract",
   type: {
     name: "Composite",
-    className: "PropertyValueContract",
+    className: "NamedValueSecretContract",
     modelProperties: {
       value: {
         serializedName: "value",
@@ -6135,55 +6327,123 @@ export const PropertyValueContract: msRest.CompositeMapper = {
   }
 };
 
-export const NamedValueEntityBaseParameters: msRest.CompositeMapper = {
-  serializedName: "NamedValueEntityBaseParameters",
+export const KeyVaultLastAccessStatusContractProperties: msRest.CompositeMapper = {
+  serializedName: "KeyVaultLastAccessStatusContractProperties",
   type: {
     name: "Composite",
-    className: "NamedValueEntityBaseParameters",
+    className: "KeyVaultLastAccessStatusContractProperties",
     modelProperties: {
-      tags: {
-        serializedName: "tags",
-        constraints: {
-          MaxItems: 32
-        },
+      code: {
+        serializedName: "code",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      secret: {
-        serializedName: "secret",
+      message: {
+        serializedName: "message",
         type: {
-          name: "Boolean"
+          name: "String"
+        }
+      },
+      timeStampUtc: {
+        serializedName: "timeStampUtc",
+        type: {
+          name: "DateTime"
         }
       }
     }
   }
 };
 
-export const NamedValueContract: msRest.CompositeMapper = {
-  serializedName: "NamedValueContract",
+export const KeyVaultContractCreateProperties: msRest.CompositeMapper = {
+  serializedName: "KeyVaultContractCreateProperties",
   type: {
     name: "Composite",
-    className: "NamedValueContract",
+    className: "KeyVaultContractCreateProperties",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      tags: {
-        serializedName: "properties.tags",
-        constraints: {
-          MaxItems: 32
-        },
+      secretIdentifier: {
+        serializedName: "secretIdentifier",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
+        }
+      },
+      identityClientId: {
+        serializedName: "identityClientId",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const KeyVaultContractProperties: msRest.CompositeMapper = {
+  serializedName: "KeyVaultContractProperties",
+  type: {
+    name: "Composite",
+    className: "KeyVaultContractProperties",
+    modelProperties: {
+      ...KeyVaultContractCreateProperties.type.modelProperties,
+      lastStatus: {
+        serializedName: "lastStatus",
+        type: {
+          name: "Composite",
+          className: "KeyVaultLastAccessStatusContractProperties"
+        }
+      }
+    }
+  }
+};
+
+export const NamedValueEntityBaseParameters: msRest.CompositeMapper = {
+  serializedName: "NamedValueEntityBaseParameters",
+  type: {
+    name: "Composite",
+    className: "NamedValueEntityBaseParameters",
+    modelProperties: {
+      tags: {
+        serializedName: "tags",
+        constraints: {
+          MaxItems: 32
+        },
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      secret: {
+        serializedName: "secret",
+        type: {
+          name: "Boolean"
+        }
+      }
+    }
+  }
+};
+
+export const NamedValueContract: msRest.CompositeMapper = {
+  serializedName: "NamedValueContract",
+  type: {
+    name: "Composite",
+    className: "NamedValueContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      tags: {
+        serializedName: "properties.tags",
+        constraints: {
+          MaxItems: 32
+        },
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       },
       secret: {
@@ -6207,12 +6467,18 @@ export const NamedValueContract: msRest.CompositeMapper = {
       value: {
         serializedName: "properties.value",
         constraints: {
-          MaxLength: 4096,
-          MinLength: 1
+          MaxLength: 4096
         },
         type: {
           name: "String"
         }
+      },
+      keyVault: {
+        serializedName: "properties.keyVault",
+        type: {
+          name: "Composite",
+          className: "KeyVaultContractProperties"
+        }
       }
     }
   }
@@ -6264,6 +6530,13 @@ export const NamedValueUpdateParameters: msRest.CompositeMapper = {
         type: {
           name: "String"
         }
+      },
+      keyVault: {
+        serializedName: "properties.keyVault",
+        type: {
+          name: "Composite",
+          className: "KeyVaultContractCreateProperties"
+        }
       }
     }
   }
@@ -6309,15 +6582,20 @@ export const NamedValueCreateContract: msRest.CompositeMapper = {
         }
       },
       value: {
-        required: true,
         serializedName: "properties.value",
         constraints: {
-          MaxLength: 4096,
-          MinLength: 1
+          MaxLength: 4096
         },
         type: {
           name: "String"
         }
+      },
+      keyVault: {
+        serializedName: "properties.keyVault",
+        type: {
+          name: "Composite",
+          className: "KeyVaultContractCreateProperties"
+        }
       }
     }
   }
@@ -6365,6 +6643,20 @@ export const ConnectivityStatusContract: msRest.CompositeMapper = {
         type: {
           name: "DateTime"
         }
+      },
+      resourceType: {
+        required: true,
+        serializedName: "resourceType",
+        type: {
+          name: "String"
+        }
+      },
+      isOptional: {
+        required: true,
+        serializedName: "isOptional",
+        type: {
+          name: "Boolean"
+        }
       }
     }
   }
@@ -6588,13 +6880,15 @@ export const NotificationContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
-  serializedName: "OpenidConnectProviderUpdateContract",
+export const OpenidConnectProviderContract: msRest.CompositeMapper = {
+  serializedName: "OpenidConnectProviderContract",
   type: {
     name: "Composite",
-    className: "OpenidConnectProviderUpdateContract",
+    className: "OpenidConnectProviderContract",
     modelProperties: {
+      ...Resource.type.modelProperties,
       displayName: {
+        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 50
@@ -6610,12 +6904,14 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
         }
       },
       metadataEndpoint: {
+        required: true,
         serializedName: "properties.metadataEndpoint",
         type: {
           name: "String"
         }
       },
       clientId: {
+        required: true,
         serializedName: "properties.clientId",
         type: {
           name: "String"
@@ -6631,15 +6927,13 @@ export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
   }
 };
 
-export const OpenidConnectProviderContract: msRest.CompositeMapper = {
-  serializedName: "OpenidConnectProviderContract",
+export const OpenidConnectProviderUpdateContract: msRest.CompositeMapper = {
+  serializedName: "OpenidConnectProviderUpdateContract",
   type: {
     name: "Composite",
-    className: "OpenidConnectProviderContract",
+    className: "OpenidConnectProviderUpdateContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
       displayName: {
-        required: true,
         serializedName: "properties.displayName",
         constraints: {
           MaxLength: 50
@@ -6655,14 +6949,12 @@ export const OpenidConnectProviderContract: msRest.CompositeMapper = {
         }
       },
       metadataEndpoint: {
-        required: true,
         serializedName: "properties.metadataEndpoint",
         type: {
           name: "String"
         }
       },
       clientId: {
-        required: true,
         serializedName: "properties.clientId",
         type: {
           name: "String"
@@ -7134,6 +7426,28 @@ export const QuotaCounterContract: msRest.CompositeMapper = {
   }
 };
 
+export const QuotaCounterValueUpdateContract: msRest.CompositeMapper = {
+  serializedName: "QuotaCounterValueUpdateContract",
+  type: {
+    name: "Composite",
+    className: "QuotaCounterValueUpdateContract",
+    modelProperties: {
+      callsCount: {
+        serializedName: "properties.callsCount",
+        type: {
+          name: "Number"
+        }
+      },
+      kbTransferred: {
+        serializedName: "properties.kbTransferred",
+        type: {
+          name: "Number"
+        }
+      }
+    }
+  }
+};
+
 export const QuotaCounterCollection: msRest.CompositeMapper = {
   serializedName: "QuotaCounterCollection",
   type: {
@@ -8232,6 +8546,22 @@ export const ApiCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "api-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiReleaseGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "apirelease-getentitytag-headers",
   type: {
@@ -8280,6 +8610,22 @@ export const ApiReleaseCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiReleaseUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "apirelease-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiReleaseUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiOperationGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "apioperation-getentitytag-headers",
   type: {
@@ -8328,6 +8674,22 @@ export const ApiOperationCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiOperationUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "apioperation-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiOperationUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiOperationPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "apioperationpolicy-getentitytag-headers",
   type: {
@@ -8552,6 +8914,22 @@ export const ApiDiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiDiagnosticUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "apidiagnostic-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiDiagnosticUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiIssueGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "apiissue-getentitytag-headers",
   type: {
@@ -8600,6 +8978,22 @@ export const ApiIssueCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiIssueUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "apiissue-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiIssueUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiIssueCommentGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "apiissuecomment-getentitytag-headers",
   type: {
@@ -8840,6 +9234,22 @@ export const ApiVersionSetCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ApiVersionSetUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "apiversionset-update-headers",
+  type: {
+    name: "Composite",
+    className: "ApiVersionSetUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const AuthorizationServerGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "authorizationserver-getentitytag-headers",
   type: {
@@ -8888,6 +9298,38 @@ export const AuthorizationServerCreateOrUpdateHeaders: msRest.CompositeMapper =
   }
 };
 
+export const AuthorizationServerUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "authorizationserver-update-headers",
+  type: {
+    name: "Composite",
+    className: "AuthorizationServerUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const AuthorizationServerListSecretsHeaders: msRest.CompositeMapper = {
+  serializedName: "authorizationserver-listsecrets-headers",
+  type: {
+    name: "Composite",
+    className: "AuthorizationServerListSecretsHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const BackendGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "backend-getentitytag-headers",
   type: {
@@ -8936,6 +9378,22 @@ export const BackendCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const BackendUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "backend-update-headers",
+  type: {
+    name: "Composite",
+    className: "BackendUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const CacheGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "cache-getentitytag-headers",
   type: {
@@ -8984,11 +9442,27 @@ export const CacheCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
-export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
-  serializedName: "certificate-getentitytag-headers",
+export const CacheUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "cache-update-headers",
   type: {
     name: "Composite",
-    className: "CertificateGetEntityTagHeaders",
+    className: "CacheUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const CertificateGetEntityTagHeaders: msRest.CompositeMapper = {
+  serializedName: "certificate-getentitytag-headers",
+  type: {
+    name: "Composite",
+    className: "CertificateGetEntityTagHeaders",
     modelProperties: {
       eTag: {
         serializedName: "etag",
@@ -9032,6 +9506,86 @@ export const CertificateCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ContentTypeGetHeaders: msRest.CompositeMapper = {
+  serializedName: "contenttype-get-headers",
+  type: {
+    name: "Composite",
+    className: "ContentTypeGetHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeCreateOrUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "contenttype-createorupdate-headers",
+  type: {
+    name: "Composite",
+    className: "ContentTypeCreateOrUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeContentItemGetEntityTagHeaders: msRest.CompositeMapper = {
+  serializedName: "contenttypecontentitem-getentitytag-headers",
+  type: {
+    name: "Composite",
+    className: "ContentTypeContentItemGetEntityTagHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeContentItemGetHeaders: msRest.CompositeMapper = {
+  serializedName: "contenttypecontentitem-get-headers",
+  type: {
+    name: "Composite",
+    className: "ContentTypeContentItemGetHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeContentItemCreateOrUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "contenttypecontentitem-createorupdate-headers",
+  type: {
+    name: "Composite",
+    className: "ContentTypeContentItemCreateOrUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const DiagnosticGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "diagnostic-getentitytag-headers",
   type: {
@@ -9080,6 +9634,22 @@ export const DiagnosticCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const DiagnosticUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "diagnostic-update-headers",
+  type: {
+    name: "Composite",
+    className: "DiagnosticUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const EmailTemplateGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "emailtemplate-getentitytag-headers",
   type: {
@@ -9112,6 +9682,22 @@ export const EmailTemplateGetHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const EmailTemplateUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "emailtemplate-update-headers",
+  type: {
+    name: "Composite",
+    className: "EmailTemplateUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const GatewayGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "gateway-getentitytag-headers",
   type: {
@@ -9160,6 +9746,22 @@ export const GatewayCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const GatewayUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "gateway-update-headers",
+  type: {
+    name: "Composite",
+    className: "GatewayUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const GatewayListKeysHeaders: msRest.CompositeMapper = {
   serializedName: "gateway-listkeys-headers",
   type: {
@@ -9288,6 +9890,22 @@ export const GroupCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const GroupUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "group-update-headers",
+  type: {
+    name: "Composite",
+    className: "GroupUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const IdentityProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "identityprovider-getentitytag-headers",
   type: {
@@ -9336,6 +9954,38 @@ export const IdentityProviderCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const IdentityProviderUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "identityprovider-update-headers",
+  type: {
+    name: "Composite",
+    className: "IdentityProviderUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const IdentityProviderListSecretsHeaders: msRest.CompositeMapper = {
+  serializedName: "identityprovider-listsecrets-headers",
+  type: {
+    name: "Composite",
+    className: "IdentityProviderListSecretsHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const IssueGetHeaders: msRest.CompositeMapper = {
   serializedName: "issue-get-headers",
   type: {
@@ -9400,6 +10050,22 @@ export const LoggerCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const LoggerUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "logger-update-headers",
+  type: {
+    name: "Composite",
+    className: "LoggerUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const NamedValueGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "namedvalue-getentitytag-headers",
   type: {
@@ -9464,6 +10130,22 @@ export const NamedValueUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const NamedValueListValueHeaders: msRest.CompositeMapper = {
+  serializedName: "namedvalue-listvalue-headers",
+  type: {
+    name: "Composite",
+    className: "NamedValueListValueHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const OpenIdConnectProviderGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "openidconnectprovider-getentitytag-headers",
   type: {
@@ -9512,6 +10194,38 @@ export const OpenIdConnectProviderCreateOrUpdateHeaders: msRest.CompositeMapper
   }
 };
 
+export const OpenIdConnectProviderUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "openidconnectprovider-update-headers",
+  type: {
+    name: "Composite",
+    className: "OpenIdConnectProviderUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const OpenIdConnectProviderListSecretsHeaders: msRest.CompositeMapper = {
+  serializedName: "openidconnectprovider-listsecrets-headers",
+  type: {
+    name: "Composite",
+    className: "OpenIdConnectProviderListSecretsHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const PolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "policy-getentitytag-headers",
   type: {
@@ -9704,6 +10418,22 @@ export const ProductCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const ProductUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "product-update-headers",
+  type: {
+    name: "Composite",
+    className: "ProductUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ProductPolicyGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "productpolicy-getentitytag-headers",
   type: {
@@ -9832,6 +10562,38 @@ export const SubscriptionCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const SubscriptionUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "subscription-update-headers",
+  type: {
+    name: "Composite",
+    className: "SubscriptionUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const SubscriptionListSecretsHeaders: msRest.CompositeMapper = {
+  serializedName: "subscription-listsecrets-headers",
+  type: {
+    name: "Composite",
+    className: "SubscriptionListSecretsHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const TagGetEntityStateHeaders: msRest.CompositeMapper = {
   serializedName: "tag-getentitystate-headers",
   type: {
@@ -9880,6 +10642,22 @@ export const TagCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const TagUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "tag-update-headers",
+  type: {
+    name: "Composite",
+    className: "TagUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const TenantAccessGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "tenantaccess-getentitytag-headers",
   type: {
@@ -9912,6 +10690,22 @@ export const TenantAccessGetHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const TenantAccessUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "tenantaccess-update-headers",
+  type: {
+    name: "Composite",
+    className: "TenantAccessUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const TenantAccessListSecretsHeaders: msRest.CompositeMapper = {
   serializedName: "tenantaccess-listsecrets-headers",
   type: {
@@ -10008,6 +10802,22 @@ export const UserCreateOrUpdateHeaders: msRest.CompositeMapper = {
   }
 };
 
+export const UserUpdateHeaders: msRest.CompositeMapper = {
+  serializedName: "user-update-headers",
+  type: {
+    name: "Composite",
+    className: "UserUpdateHeaders",
+    modelProperties: {
+      eTag: {
+        serializedName: "etag",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiCollection: msRest.CompositeMapper = {
   serializedName: "ApiCollection",
   type: {
@@ -10534,6 +11344,96 @@ export const CertificateCollection: msRest.CompositeMapper = {
   }
 };
 
+export const ContentTypeCollection: msRest.CompositeMapper = {
+  serializedName: "ContentTypeCollection",
+  type: {
+    name: "Composite",
+    className: "ContentTypeCollection",
+    modelProperties: {
+      value: {
+        readOnly: true,
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ContentTypeContract"
+            }
+          }
+        }
+      },
+      nextLink: {
+        readOnly: true,
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const ContentItemCollection: msRest.CompositeMapper = {
+  serializedName: "ContentItemCollection",
+  type: {
+    name: "Composite",
+    className: "ContentItemCollection",
+    modelProperties: {
+      value: {
+        readOnly: true,
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ContentItemContract"
+            }
+          }
+        }
+      },
+      nextLink: {
+        readOnly: true,
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const DeletedServicesCollection: msRest.CompositeMapper = {
+  serializedName: "DeletedServicesCollection",
+  type: {
+    name: "Composite",
+    className: "DeletedServicesCollection",
+    modelProperties: {
+      value: {
+        readOnly: true,
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "DeletedServiceContract"
+            }
+          }
+        }
+      },
+      nextLink: {
+        readOnly: true,
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const OperationListResult: msRest.CompositeMapper = {
   serializedName: "OperationListResult",
   type: {
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
index ff5563e54053..141805aab5f4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueCollection,
   NamedValueContract,
@@ -59,6 +65,8 @@ export {
   NamedValueCreateOrUpdateHeaders,
   NamedValueGetEntityTagHeaders,
   NamedValueGetHeaders,
+  NamedValueListValueHeaders,
+  NamedValueSecretContract,
   NamedValueUpdateHeaders,
   NamedValueUpdateParameters,
   NotificationContract,
@@ -74,7 +82,6 @@ export {
   PortalSigninSettings,
   PortalSignupSettings,
   ProductContract,
-  PropertyValueContract,
   RecipientEmailContract,
   RecipientsContractProperties,
   RecipientUserContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
index b82a3ea1eab4..bd53c9ce9b45 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
index 16c005715b18..730cabc002dd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
index a1fb53d824c6..19a99f24f0b3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
index 4ffb64cf0376..b7bdd38988a9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
@@ -37,6 +37,9 @@ export {
   CertificateContract,
   CertificateInformation,
   ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -53,6 +56,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
@@ -64,7 +70,9 @@ export {
   OpenIdConnectProviderCreateOrUpdateHeaders,
   OpenIdConnectProviderGetEntityTagHeaders,
   OpenIdConnectProviderGetHeaders,
+  OpenIdConnectProviderListSecretsHeaders,
   OpenidConnectProviderUpdateContract,
+  OpenIdConnectProviderUpdateHeaders,
   OperationContract,
   ParameterContract,
   PipelineDiagnosticSettings,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index 40b557d6bd63..57cf5db2172a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
@@ -71,6 +71,19 @@ export const apiVersion: msRest.OperationQueryParameter = {
     }
   }
 };
+export const appType: msRest.OperationQueryParameter = {
+  parameterPath: [
+    "options",
+    "appType"
+  ],
+  mapper: {
+    serializedName: "appType",
+    defaultValue: 'portal',
+    type: {
+      name: "String"
+    }
+  }
+};
 export const attachmentId: msRest.OperationURLParameter = {
   parameterPath: "attachmentId",
   mapper: {
@@ -172,6 +185,34 @@ export const configurationName: msRest.OperationURLParameter = {
     }
   }
 };
+export const contentItemId: msRest.OperationURLParameter = {
+  parameterPath: "contentItemId",
+  mapper: {
+    required: true,
+    serializedName: "contentItemId",
+    constraints: {
+      MaxLength: 80,
+      MinLength: 1
+    },
+    type: {
+      name: "String"
+    }
+  }
+};
+export const contentTypeId: msRest.OperationURLParameter = {
+  parameterPath: "contentTypeId",
+  mapper: {
+    required: true,
+    serializedName: "contentTypeId",
+    constraints: {
+      MaxLength: 80,
+      MinLength: 1
+    },
+    type: {
+      name: "String"
+    }
+  }
+};
 export const deleteRevisions: msRest.OperationQueryParameter = {
   parameterPath: [
     "options",
@@ -461,6 +502,16 @@ export const issueId: msRest.OperationURLParameter = {
     }
   }
 };
+export const location: msRest.OperationURLParameter = {
+  parameterPath: "location",
+  mapper: {
+    required: true,
+    serializedName: "location",
+    type: {
+      name: "String"
+    }
+  }
+};
 export const locationName: msRest.OperationURLParameter = {
   parameterPath: "locationName",
   mapper: {
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
index b0eb43eb71d2..0744779266d6 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
index 9caf6ee9ab57..41398a207abd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
index 76b1488cc812..caed882dab67 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
@@ -37,6 +37,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -53,6 +56,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
index f48788d98b20..ff9b68924daa 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -53,6 +56,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
index 87092fa3ab06..bbc521357bf8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
@@ -39,6 +39,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -55,6 +58,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
@@ -78,6 +84,7 @@ export {
   ProductGetEntityTagHeaders,
   ProductGetHeaders,
   ProductTagResourceContractProperties,
+  ProductUpdateHeaders,
   ProductUpdateParameters,
   RecipientEmailContract,
   RecipientsContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
index 64ac202f796a..34033d339ba7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
index e21019e9e856..e0cd6bf7cba9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/quotaByCounterKeysMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/quotaByCounterKeysMappers.ts
index b01b41bfabba..b8779edb2036 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/quotaByCounterKeysMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/quotaByCounterKeysMappers.ts
@@ -11,5 +11,6 @@ export {
   ErrorResponse,
   QuotaCounterCollection,
   QuotaCounterContract,
-  QuotaCounterValueContractProperties
+  QuotaCounterValueContractProperties,
+  QuotaCounterValueUpdateContract
 } from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/quotaByPeriodKeysMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/quotaByPeriodKeysMappers.ts
index e7c6180e44ed..9f936dd59295 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/quotaByPeriodKeysMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/quotaByPeriodKeysMappers.ts
@@ -10,5 +10,6 @@ export {
   ErrorFieldContract,
   ErrorResponse,
   QuotaCounterContract,
-  QuotaCounterValueContractProperties
+  QuotaCounterValueContractProperties,
+  QuotaCounterValueUpdateContract
 } from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts
index 25a28d6ee8ef..6cb7a79a07fd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
index 050a808f4053..bc0f85ce1b40 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
index eda090037b74..de8293a39a8a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
@@ -87,7 +93,9 @@ export {
   SubscriptionGetHeaders,
   SubscriptionKeyParameterNamesContract,
   SubscriptionKeysContract,
+  SubscriptionListSecretsHeaders,
   SubscriptionsDelegationSettingsProperties,
+  SubscriptionUpdateHeaders,
   SubscriptionUpdateParameters,
   TagContract,
   TagDescriptionContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
index 887095666625..0530ee5d6300 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
@@ -96,6 +102,7 @@ export {
   TagGetEntityStateByProductHeaders,
   TagGetEntityStateHeaders,
   TagGetHeaders,
+  TagUpdateHeaders,
   TermsOfServiceProperties,
   TokenBodyParameterContract,
   UserContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/tenantAccessMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/tenantAccessMappers.ts
index 3605444a18b5..fe5ffb42f78f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/tenantAccessMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/tenantAccessMappers.ts
@@ -13,5 +13,6 @@ export {
   ErrorResponse,
   TenantAccessGetEntityTagHeaders,
   TenantAccessGetHeaders,
-  TenantAccessListSecretsHeaders
+  TenantAccessListSecretsHeaders,
+  TenantAccessUpdateHeaders
 } from "../models/mappers";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
index f48788d98b20..ff9b68924daa 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -53,6 +56,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
index d2d15d6016db..863f343b87db 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -53,6 +56,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
@@ -97,6 +103,7 @@ export {
   UserIdentityProperties,
   UserTokenParameters,
   UserTokenResult,
+  UserUpdateHeaders,
   UserUpdateParameters,
   VirtualNetworkConfiguration,
   X509CertificateName
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
index e21019e9e856..e0cd6bf7cba9 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
@@ -36,6 +36,9 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
+  DeletedServiceContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
@@ -52,6 +55,9 @@ export {
   IssueAttachmentContract,
   IssueCommentContract,
   IssueContract,
+  KeyVaultContractCreateProperties,
+  KeyVaultContractProperties,
+  KeyVaultLastAccessStatusContractProperties,
   LoggerContract,
   NamedValueContract,
   NamedValueCreateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..987095c8c079 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -162,9 +162,9 @@ export class Api {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -175,7 +175,7 @@ export class Api {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.ApiContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -187,8 +187,8 @@ export class Api {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -199,7 +199,7 @@ export class Api {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiUpdateResponse>;
   }
 
   /**
@@ -412,7 +412,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiGetEntityTagHeaders
     }
   },
   serializer
@@ -439,7 +440,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiGetHeaders
     }
   },
   serializer
@@ -469,9 +471,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.ApiContract,
+      headersMapper: Mappers.ApiUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiUpdateHeaders
     }
   },
   serializer
@@ -569,7 +575,8 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
index aac5ab05ff5e..4e0ffe9a930c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -206,9 +206,9 @@ export class ApiDiagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiDiagnosticUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiDiagnosticUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -220,7 +220,7 @@ export class ApiDiagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -233,8 +233,8 @@ export class ApiDiagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,7 +246,7 @@ export class ApiDiagnostic {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiDiagnosticUpdateResponse>;
   }
 
   /**
@@ -380,7 +380,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiDiagnosticGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiDiagnosticGetEntityTagHeaders
     }
   },
   serializer
@@ -408,7 +409,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiDiagnosticGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiDiagnosticGetHeaders
     }
   },
   serializer
@@ -448,7 +450,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiDiagnosticCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiDiagnosticCreateOrUpdateHeaders
     }
   },
   serializer
@@ -479,9 +482,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.DiagnosticContract,
+      headersMapper: Mappers.ApiDiagnosticUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiDiagnosticUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..486bd56faa34 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -196,9 +196,9 @@ export class ApiIssue {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiIssueUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiIssueUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -209,7 +209,7 @@ export class ApiIssue {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.IssueContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -221,8 +221,8 @@ export class ApiIssue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,7 +234,7 @@ export class ApiIssue {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiIssueUpdateResponse>;
   }
 
   /**
@@ -366,7 +366,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueGetEntityTagHeaders
     }
   },
   serializer
@@ -395,7 +396,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueGetHeaders
     }
   },
   serializer
@@ -435,7 +437,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueCreateOrUpdateHeaders
     }
   },
   serializer
@@ -466,9 +469,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.IssueContract,
+      headersMapper: Mappers.ApiIssueUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
index 9392f644c44d..da1bebe2ef53 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueAttachment.ts
@@ -337,7 +337,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueAttachmentGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueAttachmentGetEntityTagHeaders
     }
   },
   serializer
@@ -366,7 +367,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueAttachmentGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueAttachmentGetHeaders
     }
   },
   serializer
@@ -407,7 +409,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueAttachmentCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueAttachmentCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
index 8f4584a711ee..79cc5d014f4b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssueComment.ts
@@ -337,7 +337,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueCommentGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueCommentGetEntityTagHeaders
     }
   },
   serializer
@@ -366,7 +367,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueCommentGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueCommentGetHeaders
     }
   },
   serializer
@@ -407,7 +409,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiIssueCommentCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiIssueCommentCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
index 02d3a4495eeb..f4dea798c9c1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -219,9 +219,9 @@ export class ApiOperation {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiOperationUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiOperationUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -234,7 +234,7 @@ export class ApiOperation {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.OperationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -248,8 +248,8 @@ export class ApiOperation {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -261,7 +261,7 @@ export class ApiOperation {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiOperationUpdateResponse>;
   }
 
   /**
@@ -399,7 +399,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationGetEntityTagHeaders
     }
   },
   serializer
@@ -427,7 +428,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationGetHeaders
     }
   },
   serializer
@@ -467,7 +469,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationCreateOrUpdateHeaders
     }
   },
   serializer
@@ -498,9 +501,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.OperationContract,
+      headersMapper: Mappers.ApiOperationUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
index 7e7f6bd110f5..ae56f356189e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperationPolicy.ts
@@ -319,7 +319,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationPolicyGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationPolicyGetEntityTagHeaders
     }
   },
   serializer
@@ -349,7 +350,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationPolicyGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationPolicyGetHeaders
     }
   },
   serializer
@@ -390,7 +392,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiOperationPolicyCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiOperationPolicyCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
index 4d5ddbc68485..73c3139aa21f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiPolicy.ts
@@ -282,7 +282,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiPolicyGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiPolicyGetEntityTagHeaders
     }
   },
   serializer
@@ -311,7 +312,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiPolicyGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiPolicyGetHeaders
     }
   },
   serializer
@@ -351,7 +353,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiPolicyCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiPolicyCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
index f0d3cedeb6d3..0c7c24c0e3cd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -208,9 +208,9 @@ export class ApiRelease {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiReleaseUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiReleaseUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -222,7 +222,7 @@ export class ApiRelease {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -235,8 +235,8 @@ export class ApiRelease {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -248,7 +248,7 @@ export class ApiRelease {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiReleaseUpdateResponse>;
   }
 
   /**
@@ -384,7 +384,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiReleaseGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiReleaseGetEntityTagHeaders
     }
   },
   serializer
@@ -412,7 +413,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiReleaseGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiReleaseGetHeaders
     }
   },
   serializer
@@ -452,7 +454,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiReleaseCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiReleaseCreateOrUpdateHeaders
     }
   },
   serializer
@@ -483,9 +486,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.ApiReleaseContract,
+      headersMapper: Mappers.ApiReleaseUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiReleaseUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
index 0dd8f3e7d781..2f8169ddc654 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiSchema.ts
@@ -335,7 +335,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiSchemaGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiSchemaGetEntityTagHeaders
     }
   },
   serializer
@@ -363,7 +364,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiSchemaGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiSchemaGetHeaders
     }
   },
   serializer
@@ -434,7 +436,8 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiSchemaCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiSchemaCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
index 3b9dbd9265ca..fbad816b6c38 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiTagDescription.ts
@@ -343,7 +343,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiTagDescriptionGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiTagDescriptionGetEntityTagHeaders
     }
   },
   serializer
@@ -371,7 +372,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiTagDescriptionGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiTagDescriptionGetHeaders
     }
   },
   serializer
@@ -411,7 +413,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiTagDescriptionCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiTagDescriptionCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
index 5f6861172541..3232766bacb8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -189,9 +189,9 @@ export class ApiVersionSet {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ApiVersionSetUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ApiVersionSetUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class ApiVersionSet {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class ApiVersionSet {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class ApiVersionSet {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ApiVersionSetUpdateResponse>;
   }
 
   /**
@@ -354,7 +354,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiVersionSetGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiVersionSetGetEntityTagHeaders
     }
   },
   serializer
@@ -381,7 +382,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiVersionSetGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiVersionSetGetHeaders
     }
   },
   serializer
@@ -420,7 +422,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ApiVersionSetCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiVersionSetCreateOrUpdateHeaders
     }
   },
   serializer
@@ -450,9 +453,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.ApiVersionSetContract,
+      headersMapper: Mappers.ApiVersionSetUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ApiVersionSetUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 6ec8faf37b10..6a0ee2d84b6b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -179,9 +179,9 @@ export class AuthorizationServer {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.AuthorizationServerUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.AuthorizationServerUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class AuthorizationServer {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class AuthorizationServer {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.AuthorizationServerUpdateResponse>;
   }
 
   /**
@@ -275,7 +275,7 @@ export class AuthorizationServer {
    * @param authsid Identifier of the authorization server.
    * @param callback The callback
    */
-  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.ClientSecretContract>): void;
+  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, callback: msRest.ServiceCallback<Models.AuthorizationServerSecretsContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -283,8 +283,8 @@ export class AuthorizationServer {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ClientSecretContract>): void;
-  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ClientSecretContract>, callback?: msRest.ServiceCallback<Models.ClientSecretContract>): Promise<Models.AuthorizationServerListSecretsResponse> {
+  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerSecretsContract>): void;
+  listSecrets(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerSecretsContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerSecretsContract>): Promise<Models.AuthorizationServerListSecretsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -375,7 +375,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.AuthorizationServerGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.AuthorizationServerGetEntityTagHeaders
     }
   },
   serializer
@@ -402,7 +403,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.AuthorizationServerGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.AuthorizationServerGetHeaders
     }
   },
   serializer
@@ -441,7 +443,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.AuthorizationServerCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.AuthorizationServerCreateOrUpdateHeaders
     }
   },
   serializer
@@ -471,9 +474,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.AuthorizationServerContract,
+      headersMapper: Mappers.AuthorizationServerUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.AuthorizationServerUpdateHeaders
     }
   },
   serializer
@@ -522,10 +529,12 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ClientSecretContract
+      bodyMapper: Mappers.AuthorizationServerSecretsContract,
+      headersMapper: Mappers.AuthorizationServerListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.AuthorizationServerListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..f708efadb40f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -189,9 +189,9 @@ export class Backend {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.BackendUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.BackendUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Backend {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.BackendContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Backend {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
+  update(resourceGroupName: string, serviceName: string, backendId: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class Backend {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.BackendUpdateResponse>;
   }
 
   /**
@@ -394,7 +394,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.BackendGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.BackendGetEntityTagHeaders
     }
   },
   serializer
@@ -421,7 +422,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.BackendGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.BackendGetHeaders
     }
   },
   serializer
@@ -460,7 +462,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.BackendCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.BackendCreateOrUpdateHeaders
     }
   },
   serializer
@@ -490,9 +493,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.BackendContract,
+      headersMapper: Mappers.BackendUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.BackendUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..accf16490cbf 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -189,9 +189,9 @@ export class Cache {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.CacheUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.CacheUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Cache {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.CacheContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Cache {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CacheContract>): void;
+  update(resourceGroupName: string, serviceName: string, cacheId: string, parameters: Models.CacheUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CacheContract>, callback?: msRest.ServiceCallback<Models.CacheContract>): Promise<Models.CacheUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class Cache {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.CacheUpdateResponse>;
   }
 
   /**
@@ -353,7 +353,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CacheGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CacheGetEntityTagHeaders
     }
   },
   serializer
@@ -380,7 +381,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CacheGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CacheGetHeaders
     }
   },
   serializer
@@ -419,7 +421,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CacheCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CacheCreateOrUpdateHeaders
     }
   },
   serializer
@@ -449,9 +452,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.CacheContract,
+      headersMapper: Mappers.CacheUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CacheUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
index f47a28ce34f4..df4b677106d3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/certificate.ts
@@ -304,7 +304,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CertificateGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CertificateGetEntityTagHeaders
     }
   },
   serializer
@@ -331,7 +332,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CertificateGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CertificateGetHeaders
     }
   },
   serializer
@@ -370,7 +372,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.CertificateCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.CertificateCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/contentType.ts b/sdk/apimanagement/arm-apimanagement/src/operations/contentType.ts
new file mode 100644
index 000000000000..f90071328af0
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/contentType.ts
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+import * as msRest from "@azure/ms-rest-js";
+import * as Models from "../models";
+import * as Mappers from "../models/contentTypeMappers";
+import * as Parameters from "../models/parameters";
+import { ApiManagementClientContext } from "../apiManagementClientContext";
+
+/** Class representing a ContentType. */
+export class ContentType {
+  private readonly client: ApiManagementClientContext;
+
+  /**
+   * Create a ContentType.
+   * @param {ApiManagementClientContext} client Reference to the service client.
+   */
+  constructor(client: ApiManagementClientContext) {
+    this.client = client;
+  }
+
+  /**
+   * Returns list of content types
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeListByServiceResponse>
+   */
+  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeListByServiceResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param callback The callback
+   */
+  listByService(resourceGroupName: string, serviceName: string, callback: msRest.ServiceCallback<Models.ContentTypeCollection>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentTypeCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentTypeCollection>, callback?: msRest.ServiceCallback<Models.ContentTypeCollection>): Promise<Models.ContentTypeListByServiceResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        options
+      },
+      listByServiceOperationSpec,
+      callback) as Promise<Models.ContentTypeListByServiceResponse>;
+  }
+
+  /**
+   * Gets API Management content type details.
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeGetResponse>
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeGetResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param callback The callback
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, callback: msRest.ServiceCallback<Models.ContentTypeContract>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentTypeContract>): void;
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentTypeContract>, callback?: msRest.ServiceCallback<Models.ContentTypeContract>): Promise<Models.ContentTypeGetResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        options
+      },
+      getOperationSpec,
+      callback) as Promise<Models.ContentTypeGetResponse>;
+  }
+
+  /**
+   * Creates or updates an Content Type.
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeCreateOrUpdateResponse>
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: Models.ContentTypeCreateOrUpdateOptionalParams): Promise<Models.ContentTypeCreateOrUpdateResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param callback The callback
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, callback: msRest.ServiceCallback<Models.ContentTypeContract>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, options: Models.ContentTypeCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ContentTypeContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: Models.ContentTypeCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ContentTypeContract>, callback?: msRest.ServiceCallback<Models.ContentTypeContract>): Promise<Models.ContentTypeCreateOrUpdateResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        options
+      },
+      createOrUpdateOperationSpec,
+      callback) as Promise<Models.ContentTypeCreateOrUpdateResponse>;
+  }
+
+  /**
+   * Removes specified content type.
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param [options] The optional parameters
+   * @returns Promise<msRest.RestResponse>
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param callback The callback
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        ifMatch,
+        options
+      },
+      deleteMethodOperationSpec,
+      callback);
+  }
+
+  /**
+   * Returns list of content types
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeListByServiceNextResponse>
+   */
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeListByServiceNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ContentTypeCollection>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentTypeCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentTypeCollection>, callback?: msRest.ServiceCallback<Models.ContentTypeCollection>): Promise<Models.ContentTypeListByServiceNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listByServiceNextOperationSpec,
+      callback) as Promise<Models.ContentTypeListByServiceNextResponse>;
+  }
+}
+
+// Operation Specifications
+const serializer = new msRest.Serializer(Mappers);
+const listByServiceOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentTypeCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const getOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentTypeContract,
+      headersMapper: Mappers.ContentTypeGetHeaders
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ContentTypeGetHeaders
+    }
+  },
+  serializer
+};
+
+const createOrUpdateOperationSpec: msRest.OperationSpec = {
+  httpMethod: "PUT",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.ifMatch0,
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentTypeContract,
+      headersMapper: Mappers.ContentTypeCreateOrUpdateHeaders
+    },
+    201: {
+      bodyMapper: Mappers.ContentTypeContract,
+      headersMapper: Mappers.ContentTypeCreateOrUpdateHeaders
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ContentTypeCreateOrUpdateHeaders
+    }
+  },
+  serializer
+};
+
+const deleteMethodOperationSpec: msRest.OperationSpec = {
+  httpMethod: "DELETE",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.ifMatch1,
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {},
+    204: {},
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const listByServiceNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentTypeCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/contentTypeContentItem.ts b/sdk/apimanagement/arm-apimanagement/src/operations/contentTypeContentItem.ts
new file mode 100644
index 000000000000..38ef251597a1
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/contentTypeContentItem.ts
@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+import * as msRest from "@azure/ms-rest-js";
+import * as Models from "../models";
+import * as Mappers from "../models/contentTypeContentItemMappers";
+import * as Parameters from "../models/parameters";
+import { ApiManagementClientContext } from "../apiManagementClientContext";
+
+/** Class representing a ContentTypeContentItem. */
+export class ContentTypeContentItem {
+  private readonly client: ApiManagementClientContext;
+
+  /**
+   * Create a ContentTypeContentItem.
+   * @param {ApiManagementClientContext} client Reference to the service client.
+   */
+  constructor(client: ApiManagementClientContext) {
+    this.client = client;
+  }
+
+  /**
+   * Returns list of content items
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeContentItemListByServiceResponse>
+   */
+  listByService(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeContentItemListByServiceResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param callback The callback
+   */
+  listByService(resourceGroupName: string, serviceName: string, contentTypeId: string, callback: msRest.ServiceCallback<Models.ContentItemCollection>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listByService(resourceGroupName: string, serviceName: string, contentTypeId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentItemCollection>): void;
+  listByService(resourceGroupName: string, serviceName: string, contentTypeId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentItemCollection>, callback?: msRest.ServiceCallback<Models.ContentItemCollection>): Promise<Models.ContentTypeContentItemListByServiceResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        options
+      },
+      listByServiceOperationSpec,
+      callback) as Promise<Models.ContentTypeContentItemListByServiceResponse>;
+  }
+
+  /**
+   * Returns content item metadata
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeContentItemGetEntityTagResponse>
+   */
+  getEntityTag(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeContentItemGetEntityTagResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param callback The callback
+   */
+  getEntityTag(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, callback: msRest.ServiceCallback<void>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  getEntityTag(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
+  getEntityTag(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ContentTypeContentItemGetEntityTagResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        contentItemId,
+        options
+      },
+      getEntityTagOperationSpec,
+      callback) as Promise<Models.ContentTypeContentItemGetEntityTagResponse>;
+  }
+
+  /**
+   * Returns content item details
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeContentItemGetResponse>
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeContentItemGetResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param callback The callback
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, callback: msRest.ServiceCallback<Models.ContentItemContract>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentItemContract>): void;
+  get(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentItemContract>, callback?: msRest.ServiceCallback<Models.ContentItemContract>): Promise<Models.ContentTypeContentItemGetResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        contentItemId,
+        options
+      },
+      getOperationSpec,
+      callback) as Promise<Models.ContentTypeContentItemGetResponse>;
+  }
+
+  /**
+   * Creates new content item
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeContentItemCreateOrUpdateResponse>
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: Models.ContentTypeContentItemCreateOrUpdateOptionalParams): Promise<Models.ContentTypeContentItemCreateOrUpdateResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param callback The callback
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, callback: msRest.ServiceCallback<Models.ContentItemContract>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options: Models.ContentTypeContentItemCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ContentItemContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, options?: Models.ContentTypeContentItemCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ContentItemContract>, callback?: msRest.ServiceCallback<Models.ContentItemContract>): Promise<Models.ContentTypeContentItemCreateOrUpdateResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        contentItemId,
+        options
+      },
+      createOrUpdateOperationSpec,
+      callback) as Promise<Models.ContentTypeContentItemCreateOrUpdateResponse>;
+  }
+
+  /**
+   * Removes specified content item.
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param [options] The optional parameters
+   * @returns Promise<msRest.RestResponse>
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param callback The callback
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  /**
+   * @param resourceGroupName The name of the resource group.
+   * @param serviceName The name of the API Management service.
+   * @param contentTypeId Content type identifier.
+   * @param contentItemId Content item identifier.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, contentTypeId: string, contentItemId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+    return this.client.sendOperationRequest(
+      {
+        resourceGroupName,
+        serviceName,
+        contentTypeId,
+        contentItemId,
+        ifMatch,
+        options
+      },
+      deleteMethodOperationSpec,
+      callback);
+  }
+
+  /**
+   * Returns list of content items
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.ContentTypeContentItemListByServiceNextResponse>
+   */
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ContentTypeContentItemListByServiceNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listByServiceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ContentItemCollection>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ContentItemCollection>): void;
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ContentItemCollection>, callback?: msRest.ServiceCallback<Models.ContentItemCollection>): Promise<Models.ContentTypeContentItemListByServiceNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listByServiceNextOperationSpec,
+      callback) as Promise<Models.ContentTypeContentItemListByServiceNextResponse>;
+  }
+}
+
+// Operation Specifications
+const serializer = new msRest.Serializer(Mappers);
+const listByServiceOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentItemCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const getEntityTagOperationSpec: msRest.OperationSpec = {
+  httpMethod: "HEAD",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems/{contentItemId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.contentItemId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      headersMapper: Mappers.ContentTypeContentItemGetEntityTagHeaders
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ContentTypeContentItemGetEntityTagHeaders
+    }
+  },
+  serializer
+};
+
+const getOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems/{contentItemId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.contentItemId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentItemContract,
+      headersMapper: Mappers.ContentTypeContentItemGetHeaders
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ContentTypeContentItemGetHeaders
+    }
+  },
+  serializer
+};
+
+const createOrUpdateOperationSpec: msRest.OperationSpec = {
+  httpMethod: "PUT",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems/{contentItemId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.contentItemId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.ifMatch0,
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentItemContract,
+      headersMapper: Mappers.ContentTypeContentItemCreateOrUpdateHeaders
+    },
+    201: {
+      bodyMapper: Mappers.ContentItemContract,
+      headersMapper: Mappers.ContentTypeContentItemCreateOrUpdateHeaders
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ContentTypeContentItemCreateOrUpdateHeaders
+    }
+  },
+  serializer
+};
+
+const deleteMethodOperationSpec: msRest.OperationSpec = {
+  httpMethod: "DELETE",
+  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/contentTypes/{contentTypeId}/contentItems/{contentItemId}",
+  urlParameters: [
+    Parameters.resourceGroupName,
+    Parameters.serviceName,
+    Parameters.contentTypeId,
+    Parameters.contentItemId,
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.ifMatch1,
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {},
+    204: {},
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const listByServiceNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.ContentItemCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
index 28179a2c2dd6..9cfcdbf951b5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/delegationSettings.ts
@@ -223,7 +223,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.DelegationSettingsGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DelegationSettingsGetEntityTagHeaders
     }
   },
   serializer
@@ -249,7 +250,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.DelegationSettingsGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DelegationSettingsGetHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/deletedServices.ts b/sdk/apimanagement/arm-apimanagement/src/operations/deletedServices.ts
new file mode 100644
index 000000000000..a14078fde450
--- /dev/null
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/deletedServices.ts
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+import * as msRest from "@azure/ms-rest-js";
+import * as Models from "../models";
+import * as Mappers from "../models/deletedServicesMappers";
+import * as Parameters from "../models/parameters";
+import { ApiManagementClientContext } from "../apiManagementClientContext";
+
+/** Class representing a DeletedServices. */
+export class DeletedServices {
+  private readonly client: ApiManagementClientContext;
+
+  /**
+   * Create a DeletedServices.
+   * @param {ApiManagementClientContext} client Reference to the service client.
+   */
+  constructor(client: ApiManagementClientContext) {
+    this.client = client;
+  }
+
+  /**
+   * Lists all soft-deleted services available for undelete for the given subscription.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.DeletedServicesListBySubscriptionResponse>
+   */
+  listBySubscription(options?: msRest.RequestOptionsBase): Promise<Models.DeletedServicesListBySubscriptionResponse>;
+  /**
+   * @param callback The callback
+   */
+  listBySubscription(callback: msRest.ServiceCallback<Models.DeletedServicesCollection>): void;
+  /**
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listBySubscription(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DeletedServicesCollection>): void;
+  listBySubscription(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DeletedServicesCollection>, callback?: msRest.ServiceCallback<Models.DeletedServicesCollection>): Promise<Models.DeletedServicesListBySubscriptionResponse> {
+    return this.client.sendOperationRequest(
+      {
+        options
+      },
+      listBySubscriptionOperationSpec,
+      callback) as Promise<Models.DeletedServicesListBySubscriptionResponse>;
+  }
+
+  /**
+   * Get soft-deleted Api Management Service by name.
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.DeletedServicesGetByNameResponse>
+   */
+  getByName(serviceName: string, location: string, options?: msRest.RequestOptionsBase): Promise<Models.DeletedServicesGetByNameResponse>;
+  /**
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param callback The callback
+   */
+  getByName(serviceName: string, location: string, callback: msRest.ServiceCallback<Models.DeletedServiceContract>): void;
+  /**
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  getByName(serviceName: string, location: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DeletedServiceContract>): void;
+  getByName(serviceName: string, location: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DeletedServiceContract>, callback?: msRest.ServiceCallback<Models.DeletedServiceContract>): Promise<Models.DeletedServicesGetByNameResponse> {
+    return this.client.sendOperationRequest(
+      {
+        serviceName,
+        location,
+        options
+      },
+      getByNameOperationSpec,
+      callback) as Promise<Models.DeletedServicesGetByNameResponse>;
+  }
+
+  /**
+   * Purges Api Management Service (deletes it with no option to undelete).
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.DeletedServicesPurgeResponse>
+   */
+  purge(serviceName: string, location: string, options?: msRest.RequestOptionsBase): Promise<Models.DeletedServicesPurgeResponse>;
+  /**
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param callback The callback
+   */
+  purge(serviceName: string, location: string, callback: msRest.ServiceCallback<Models.DeletedServiceContract>): void;
+  /**
+   * @param serviceName The name of the API Management service.
+   * @param location The location of the deleted API Management service.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  purge(serviceName: string, location: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DeletedServiceContract>): void;
+  purge(serviceName: string, location: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DeletedServiceContract>, callback?: msRest.ServiceCallback<Models.DeletedServiceContract>): Promise<Models.DeletedServicesPurgeResponse> {
+    return this.client.sendOperationRequest(
+      {
+        serviceName,
+        location,
+        options
+      },
+      purgeOperationSpec,
+      callback) as Promise<Models.DeletedServicesPurgeResponse>;
+  }
+
+  /**
+   * Lists all soft-deleted services available for undelete for the given subscription.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.DeletedServicesListBySubscriptionNextResponse>
+   */
+  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.DeletedServicesListBySubscriptionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listBySubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.DeletedServicesCollection>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DeletedServicesCollection>): void;
+  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DeletedServicesCollection>, callback?: msRest.ServiceCallback<Models.DeletedServicesCollection>): Promise<Models.DeletedServicesListBySubscriptionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listBySubscriptionNextOperationSpec,
+      callback) as Promise<Models.DeletedServicesListBySubscriptionNextResponse>;
+  }
+}
+
+// Operation Specifications
+const serializer = new msRest.Serializer(Mappers);
+const listBySubscriptionOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/deletedservices",
+  urlParameters: [
+    Parameters.subscriptionId
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.DeletedServicesCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const getByNameOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/locations/{location}/deletedservices/{serviceName}",
+  urlParameters: [
+    Parameters.serviceName,
+    Parameters.subscriptionId,
+    Parameters.location
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.DeletedServiceContract
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const purgeOperationSpec: msRest.OperationSpec = {
+  httpMethod: "DELETE",
+  path: "subscriptions/{subscriptionId}/providers/Microsoft.ApiManagement/locations/{location}/deletedservices/{serviceName}",
+  urlParameters: [
+    Parameters.serviceName,
+    Parameters.subscriptionId,
+    Parameters.location
+  ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {},
+    202: {
+      bodyMapper: Mappers.DeletedServiceContract
+    },
+    204: {},
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
+
+const listBySubscriptionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "GET",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.DeletedServicesCollection
+    },
+    default: {
+      bodyMapper: Mappers.ErrorResponse
+    }
+  },
+  serializer
+};
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..0c772783653c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -189,9 +189,9 @@ export class Diagnostic {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.DiagnosticUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.DiagnosticUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Diagnostic {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Diagnostic {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class Diagnostic {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.DiagnosticUpdateResponse>;
   }
 
   /**
@@ -354,7 +354,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.DiagnosticGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DiagnosticGetEntityTagHeaders
     }
   },
   serializer
@@ -381,7 +382,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.DiagnosticGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DiagnosticGetHeaders
     }
   },
   serializer
@@ -420,7 +422,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.DiagnosticCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DiagnosticCreateOrUpdateHeaders
     }
   },
   serializer
@@ -450,9 +453,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.DiagnosticContract,
+      headersMapper: Mappers.DiagnosticUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.DiagnosticUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..7db7586932e5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -27,7 +27,7 @@ export class EmailTemplate {
   }
 
   /**
-   * Lists a collection of properties defined within a service instance.
+   * Gets all email templates
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
@@ -234,7 +234,7 @@ export class EmailTemplate {
   }
 
   /**
-   * Updates the specific Email Template.
+   * Updates API Management email template
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param templateName Email Template Name Identifier. Possible values include:
@@ -245,13 +245,13 @@ export class EmailTemplate {
    * 'purchaseDeveloperNotificationMessage', 'passwordResetIdentityDefault',
    * 'passwordResetByAdminNotificationMessage', 'rejectDeveloperNotificationMessage',
    * 'requestDeveloperNotificationMessage'
-   * @param parameters Update parameters.
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
+   * @param parameters Update parameters.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.EmailTemplateUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, parameters: Models.EmailTemplateUpdateParameters, options?: msRest.RequestOptionsBase): Promise<Models.EmailTemplateUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -263,12 +263,12 @@ export class EmailTemplate {
    * 'purchaseDeveloperNotificationMessage', 'passwordResetIdentityDefault',
    * 'passwordResetByAdminNotificationMessage', 'rejectDeveloperNotificationMessage',
    * 'requestDeveloperNotificationMessage'
-   * @param parameters Update parameters.
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
+   * @param parameters Update parameters.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, parameters: Models.EmailTemplateUpdateParameters, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -280,25 +280,25 @@ export class EmailTemplate {
    * 'purchaseDeveloperNotificationMessage', 'passwordResetIdentityDefault',
    * 'passwordResetByAdminNotificationMessage', 'rejectDeveloperNotificationMessage',
    * 'requestDeveloperNotificationMessage'
-   * @param parameters Update parameters.
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
+   * @param parameters Update parameters.
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, parameters: Models.EmailTemplateUpdateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, parameters: Models.EmailTemplateUpdateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
         serviceName,
         templateName,
-        parameters,
         ifMatch,
+        parameters,
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.EmailTemplateUpdateResponse>;
   }
 
   /**
@@ -366,7 +366,7 @@ export class EmailTemplate {
   }
 
   /**
-   * Lists a collection of properties defined within a service instance.
+   * Gets all email templates
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param [options] The optional parameters
    * @returns Promise<Models.EmailTemplateListByServiceNextResponse>
@@ -444,7 +444,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.EmailTemplateGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.EmailTemplateGetEntityTagHeaders
     }
   },
   serializer
@@ -471,7 +472,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.EmailTemplateGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.EmailTemplateGetHeaders
     }
   },
   serializer
@@ -538,9 +540,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.EmailTemplateContract,
+      headersMapper: Mappers.EmailTemplateUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.EmailTemplateUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts b/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
index e2e9bc6fe6a3..f6578b8444af 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
@@ -189,9 +189,9 @@ export class Gateway {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.GatewayUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.GatewayUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Gateway {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, callback: msRest.ServiceCallback<Models.GatewayContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Gateway {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GatewayContract>): void;
+  update(resourceGroupName: string, serviceName: string, gatewayId: string, parameters: Models.GatewayContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GatewayContract>, callback?: msRest.ServiceCallback<Models.GatewayContract>): Promise<Models.GatewayUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class Gateway {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.GatewayUpdateResponse>;
   }
 
   /**
@@ -440,6 +440,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
+    Parameters.filter0,
     Parameters.top,
     Parameters.skip,
     Parameters.apiVersion
@@ -478,7 +479,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayGetEntityTagHeaders
     }
   },
   serializer
@@ -505,7 +507,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayGetHeaders
     }
   },
   serializer
@@ -544,7 +547,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayCreateOrUpdateHeaders
     }
   },
   serializer
@@ -574,9 +578,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.GatewayContract,
+      headersMapper: Mappers.GatewayUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayUpdateHeaders
     }
   },
   serializer
@@ -629,7 +637,8 @@ const listKeysOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayListKeysHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayListKeysHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts
index 1037389d498b..8b17acd2f77b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts
@@ -235,6 +235,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
+    Parameters.filter0,
     Parameters.top,
     Parameters.skip,
     Parameters.apiVersion
@@ -274,7 +275,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayApiGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayApiGetEntityTagHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts
index a7aa24ccfb2a..bf791cb3986e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts
@@ -113,7 +113,7 @@ export class GatewayHostnameConfiguration {
   }
 
   /**
-   * Gets the details of the Gateway hostname configuration specified by its identifier.
+   * Get details of a hostname configuration
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param gatewayId Gateway entity identifier. Must be unique in the current API Management service
@@ -170,7 +170,7 @@ export class GatewayHostnameConfiguration {
    * @param [options] The optional parameters
    * @returns Promise<Models.GatewayHostnameConfigurationCreateOrUpdateResponse>
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options?: msRest.RequestOptionsBase): Promise<Models.GatewayHostnameConfigurationCreateOrUpdateResponse>;
+  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options?: Models.GatewayHostnameConfigurationCreateOrUpdateOptionalParams): Promise<Models.GatewayHostnameConfigurationCreateOrUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -193,8 +193,8 @@ export class GatewayHostnameConfiguration {
    * @param options The optional parameters
    * @param callback The callback
    */
-  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>, callback?: msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>): Promise<Models.GatewayHostnameConfigurationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options: Models.GatewayHostnameConfigurationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>): void;
+  createOrUpdate(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, parameters: Models.GatewayHostnameConfigurationContract, options?: Models.GatewayHostnameConfigurationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>, callback?: msRest.ServiceCallback<Models.GatewayHostnameConfigurationContract>): Promise<Models.GatewayHostnameConfigurationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -216,10 +216,12 @@ export class GatewayHostnameConfiguration {
    * instance. Must not have value 'managed'
    * @param hcId Gateway hostname configuration identifier. Must be unique in the scope of parent
    * Gateway entity.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
    * @returns Promise<msRest.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -227,9 +229,11 @@ export class GatewayHostnameConfiguration {
    * instance. Must not have value 'managed'
    * @param hcId Gateway hostname configuration identifier. Must be unique in the scope of parent
    * Gateway entity.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -237,17 +241,20 @@ export class GatewayHostnameConfiguration {
    * instance. Must not have value 'managed'
    * @param hcId Gateway hostname configuration identifier. Must be unique in the scope of parent
    * Gateway entity.
+   * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
+   * response of the GET request or it should be * for unconditional update.
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, gatewayId: string, hcId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
         serviceName,
         gatewayId,
         hcId,
+        ifMatch,
         options
       },
       deleteMethodOperationSpec,
@@ -295,6 +302,7 @@ const listByServiceOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
+    Parameters.filter0,
     Parameters.top,
     Parameters.skip,
     Parameters.apiVersion
@@ -334,7 +342,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationGetEntityTagHeaders
     }
   },
   serializer
@@ -362,7 +371,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationGetHeaders
     }
   },
   serializer
@@ -382,6 +392,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.apiVersion
   ],
   headerParameters: [
+    Parameters.ifMatch0,
     Parameters.acceptLanguage
   ],
   requestBody: {
@@ -401,7 +412,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationCreateOrUpdateHeaders
     }
   },
   serializer
@@ -421,6 +433,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.apiVersion
   ],
   headerParameters: [
+    Parameters.ifMatch1,
     Parameters.acceptLanguage
   ],
   responses: {
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..d7fd5d9e3ace 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -179,9 +179,9 @@ export class Group {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.GroupUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.GroupUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Group {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.GroupContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Group {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class Group {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.GroupUpdateResponse>;
   }
 
   /**
@@ -339,7 +339,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GroupGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GroupGetEntityTagHeaders
     }
   },
   serializer
@@ -366,7 +367,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GroupGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GroupGetHeaders
     }
   },
   serializer
@@ -405,7 +407,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GroupCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GroupCreateOrUpdateHeaders
     }
   },
   serializer
@@ -435,9 +438,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.GroupContract,
+      headersMapper: Mappers.GroupUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GroupUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index b1d63a641d45..bb12fb6df5eb 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -190,9 +190,9 @@ export class IdentityProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.IdentityProviderUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.IdentityProviderUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class IdentityProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class IdentityProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -227,7 +227,7 @@ export class IdentityProvider {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.IdentityProviderUpdateResponse>;
   }
 
   /**
@@ -391,7 +391,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.IdentityProviderGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IdentityProviderGetEntityTagHeaders
     }
   },
   serializer
@@ -418,7 +419,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.IdentityProviderGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IdentityProviderGetHeaders
     }
   },
   serializer
@@ -457,7 +459,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.IdentityProviderCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IdentityProviderCreateOrUpdateHeaders
     }
   },
   serializer
@@ -487,9 +490,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.IdentityProviderContract,
+      headersMapper: Mappers.IdentityProviderUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IdentityProviderUpdateHeaders
     }
   },
   serializer
@@ -538,10 +545,12 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ClientSecretContract
+      bodyMapper: Mappers.ClientSecretContract,
+      headersMapper: Mappers.IdentityProviderListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IdentityProviderListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/index.ts b/sdk/apimanagement/arm-apimanagement/src/operations/index.ts
index c17f4b2b9cf3..4f6121e85373 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/index.ts
@@ -28,6 +28,9 @@ export * from "./authorizationServer";
 export * from "./backend";
 export * from "./cache";
 export * from "./certificate";
+export * from "./contentType";
+export * from "./contentTypeContentItem";
+export * from "./deletedServices";
 export * from "./apiManagementOperations";
 export * from "./apiManagementServiceSkus";
 export * from "./apiManagementService";
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
index 74263bc8328b..74a1b729887e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/issue.ts
@@ -174,7 +174,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.IssueGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.IssueGetHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
index ceea06065217..a20fbc217f3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -179,9 +179,9 @@ export class Logger {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.LoggerUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.LoggerUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class Logger {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
+  update(resourceGroupName: string, serviceName: string, loggerId: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class Logger {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.LoggerUpdateResponse>;
   }
 
   /**
@@ -227,7 +227,7 @@ export class Logger {
    * @param [options] The optional parameters
    * @returns Promise<msRest.RestResponse>
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams): Promise<msRest.RestResponse>;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -246,8 +246,8 @@ export class Logger {
    * @param options The optional parameters
    * @param callback The callback
    */
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: Models.LoggerDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: Models.LoggerDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -339,7 +339,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.LoggerGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.LoggerGetEntityTagHeaders
     }
   },
   serializer
@@ -366,7 +367,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.LoggerGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.LoggerGetHeaders
     }
   },
   serializer
@@ -405,7 +407,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.LoggerCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.LoggerCreateOrUpdateHeaders
     }
   },
   serializer
@@ -435,9 +438,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.LoggerContract,
+      headersMapper: Mappers.LoggerUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.LoggerUpdateHeaders
     }
   },
   serializer
@@ -453,7 +460,6 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.force,
     Parameters.apiVersion
   ],
   headerParameters: [
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
index 741f6c25bc54..5c5062b9fd60 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
@@ -28,7 +28,7 @@ export class NamedValue {
   }
 
   /**
-   * Lists a collection of NamedValues defined within a service instance.
+   * Lists a collection of named values defined within a service instance.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param [options] The optional parameters
@@ -60,7 +60,7 @@ export class NamedValue {
   }
 
   /**
-   * Gets the entity state (Etag) version of the NamedValue specified by its identifier.
+   * Gets the entity state (Etag) version of the named value specified by its identifier.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -96,7 +96,7 @@ export class NamedValue {
   }
 
   /**
-   * Gets the details of the NamedValue specified by its identifier.
+   * Gets the details of the named value specified by its identifier.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -132,7 +132,7 @@ export class NamedValue {
   }
 
   /**
-   * Creates or updates a NamedValue.
+   * Creates or updates named value.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -146,7 +146,7 @@ export class NamedValue {
   }
 
   /**
-   * Updates the specific NamedValue.
+   * Updates the specific named value.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -162,7 +162,7 @@ export class NamedValue {
   }
 
   /**
-   * Deletes specific NamedValue from the API Management service instance.
+   * Deletes specific named value from the API Management service instance.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -205,7 +205,7 @@ export class NamedValue {
   }
 
   /**
-   * Gets the secret value of the NamedValue.
+   * Gets the secret of the named value specified by its identifier.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -219,7 +219,7 @@ export class NamedValue {
    * @param namedValueId Identifier of the NamedValue.
    * @param callback The callback
    */
-  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, callback: msRest.ServiceCallback<Models.PropertyValueContract>): void;
+  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, callback: msRest.ServiceCallback<Models.NamedValueSecretContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -227,8 +227,8 @@ export class NamedValue {
    * @param options The optional parameters
    * @param callback The callback
    */
-  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyValueContract>): void;
-  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyValueContract>, callback?: msRest.ServiceCallback<Models.PropertyValueContract>): Promise<Models.NamedValueListValueResponse> {
+  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NamedValueSecretContract>): void;
+  listValue(resourceGroupName: string, serviceName: string, namedValueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NamedValueSecretContract>, callback?: msRest.ServiceCallback<Models.NamedValueSecretContract>): Promise<Models.NamedValueListValueResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -241,7 +241,7 @@ export class NamedValue {
   }
 
   /**
-   * Creates or updates a NamedValue.
+   * Creates or updates named value.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -263,7 +263,7 @@ export class NamedValue {
   }
 
   /**
-   * Updates the specific NamedValue.
+   * Updates the specific named value.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param namedValueId Identifier of the NamedValue.
@@ -288,7 +288,7 @@ export class NamedValue {
   }
 
   /**
-   * Lists a collection of NamedValues defined within a service instance.
+   * Lists a collection of named values defined within a service instance.
    * @param nextPageLink The NextLink from the previous successful call to List operation.
    * @param [options] The optional parameters
    * @returns Promise<Models.NamedValueListByServiceNextResponse>
@@ -366,7 +366,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.NamedValueGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueGetEntityTagHeaders
     }
   },
   serializer
@@ -393,7 +394,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.NamedValueGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueGetHeaders
     }
   },
   serializer
@@ -442,10 +444,12 @@ const listValueOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.PropertyValueContract
+      bodyMapper: Mappers.NamedValueSecretContract,
+      headersMapper: Mappers.NamedValueListValueHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueListValueHeaders
     }
   },
   serializer
@@ -487,7 +491,8 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.NamedValueCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueCreateOrUpdateHeaders
     }
   },
   serializer
@@ -524,11 +529,9 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
     202: {
       headersMapper: Mappers.NamedValueUpdateHeaders
     },
-    204: {
-      headersMapper: Mappers.NamedValueUpdateHeaders
-    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
index 61367e1b6b9a..8cf0c290a05e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -95,7 +95,7 @@ export class OpenIdConnectProvider {
   }
 
   /**
-   * Gets specific OpenID Connect Provider.
+   * Gets specific OpenID Connect Provider without secrets.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param opid Identifier of the OpenID Connect Provider.
@@ -179,9 +179,9 @@ export class OpenIdConnectProvider {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.OpenIdConnectProviderUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.OpenIdConnectProviderUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class OpenIdConnectProvider {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class OpenIdConnectProvider {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class OpenIdConnectProvider {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.OpenIdConnectProviderUpdateResponse>;
   }
 
   /**
@@ -375,7 +375,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.OpenIdConnectProviderGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.OpenIdConnectProviderGetEntityTagHeaders
     }
   },
   serializer
@@ -402,7 +403,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.OpenIdConnectProviderGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.OpenIdConnectProviderGetHeaders
     }
   },
   serializer
@@ -441,7 +443,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.OpenIdConnectProviderCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.OpenIdConnectProviderCreateOrUpdateHeaders
     }
   },
   serializer
@@ -471,9 +474,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.OpenidConnectProviderContract,
+      headersMapper: Mappers.OpenIdConnectProviderUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.OpenIdConnectProviderUpdateHeaders
     }
   },
   serializer
@@ -522,10 +529,12 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ClientSecretContract
+      bodyMapper: Mappers.ClientSecretContract,
+      headersMapper: Mappers.OpenIdConnectProviderListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.OpenIdConnectProviderListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
index f9736328e80a..c9cfaa0378f4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/policy.ts
@@ -246,7 +246,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.PolicyGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.PolicyGetEntityTagHeaders
     }
   },
   serializer
@@ -274,7 +275,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.PolicyGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.PolicyGetHeaders
     }
   },
   serializer
@@ -313,7 +315,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.PolicyCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.PolicyCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
index 31904c098334..cd7e3f0fcb1b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -189,9 +189,9 @@ export class Product {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.ProductUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,7 +202,7 @@ export class Product {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.ProductContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -214,8 +214,8 @@ export class Product {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -226,7 +226,7 @@ export class Product {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.ProductUpdateResponse>;
   }
 
   /**
@@ -416,7 +416,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductGetEntityTagHeaders
     }
   },
   serializer
@@ -443,7 +444,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductGetHeaders
     }
   },
   serializer
@@ -482,7 +484,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductCreateOrUpdateHeaders
     }
   },
   serializer
@@ -512,9 +515,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.ProductContract,
+      headersMapper: Mappers.ProductUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
index bd7e68b41ad9..0e5df65d0bde 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/productPolicy.ts
@@ -282,7 +282,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductPolicyGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductPolicyGetEntityTagHeaders
     }
   },
   serializer
@@ -311,7 +312,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductPolicyGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductPolicyGetHeaders
     }
   },
   serializer
@@ -351,7 +353,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.ProductPolicyCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.ProductPolicyCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
index e4976fa216f6..c16a2f0cee3d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -83,9 +83,9 @@ export class QuotaByCounterKeys {
    * counter-key="@("b"+"a")" then it will be accessible by "ba" key
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.QuotaByCounterKeysUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByCounterKeysUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -96,7 +96,7 @@ export class QuotaByCounterKeys {
    * @param parameters The value of the quota counter to be applied to all quota counter periods.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueUpdateContract, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -108,8 +108,8 @@ export class QuotaByCounterKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueUpdateContract, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -119,7 +119,7 @@ export class QuotaByCounterKeys {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.QuotaByCounterKeysUpdateResponse>;
   }
 }
 
@@ -169,12 +169,14 @@ const updateOperationSpec: msRest.OperationSpec = {
   requestBody: {
     parameterPath: "parameters",
     mapper: {
-      ...Mappers.QuotaCounterValueContractProperties,
+      ...Mappers.QuotaCounterValueUpdateContract,
       required: true
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.QuotaCounterCollection
+    },
     default: {
       bodyMapper: Mappers.ErrorResponse
     }
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..110a57778642 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -87,9 +87,9 @@ export class QuotaByPeriodKeys {
    * @param quotaPeriodKey Quota period key identifier.
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.QuotaByPeriodKeysUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase): Promise<Models.QuotaByPeriodKeysUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -101,7 +101,7 @@ export class QuotaByPeriodKeys {
    * @param parameters The value of the Quota counter to be applied on the specified period.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueUpdateContract, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -114,8 +114,8 @@ export class QuotaByPeriodKeys {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueUpdateContract, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -126,7 +126,7 @@ export class QuotaByPeriodKeys {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.QuotaByPeriodKeysUpdateResponse>;
   }
 }
 
@@ -178,12 +178,14 @@ const updateOperationSpec: msRest.OperationSpec = {
   requestBody: {
     parameterPath: "parameters",
     mapper: {
-      ...Mappers.QuotaCounterValueContractProperties,
+      ...Mappers.QuotaCounterValueUpdateContract,
       required: true
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.QuotaCounterContract
+    },
     default: {
       bodyMapper: Mappers.ErrorResponse
     }
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
index dd971ea317b3..a056a8199786 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signInSettings.ts
@@ -191,7 +191,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SignInSettingsGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SignInSettingsGetEntityTagHeaders
     }
   },
   serializer
@@ -217,7 +218,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SignInSettingsGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SignInSettingsGetHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
index bd3214a4dffd..9ea9865981ad 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/signUpSettings.ts
@@ -191,7 +191,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SignUpSettingsGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SignUpSettingsGetEntityTagHeaders
     }
   },
   serializer
@@ -217,7 +218,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SignUpSettingsGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SignUpSettingsGetHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
index 6d68505b8bc1..d6e268feb422 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -190,9 +190,9 @@ export class Subscription {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.SubscriptionUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams): Promise<Models.SubscriptionUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -203,7 +203,7 @@ export class Subscription {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -215,8 +215,8 @@ export class Subscription {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -227,7 +227,7 @@ export class Subscription {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.SubscriptionUpdateResponse>;
   }
 
   /**
@@ -355,7 +355,7 @@ export class Subscription {
   }
 
   /**
-   * Gets the subscription keys.
+   * Gets the specified Subscription keys.
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
    * @param sid Subscription entity Identifier. The entity represents the association between a user
@@ -472,7 +472,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SubscriptionGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SubscriptionGetEntityTagHeaders
     }
   },
   serializer
@@ -499,7 +500,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SubscriptionGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SubscriptionGetHeaders
     }
   },
   serializer
@@ -516,7 +518,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
   ],
   queryParameters: [
     Parameters.notify,
-    Parameters.apiVersion
+    Parameters.apiVersion,
+    Parameters.appType
   ],
   headerParameters: [
     Parameters.ifMatch0,
@@ -539,7 +542,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.SubscriptionCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SubscriptionCreateOrUpdateHeaders
     }
   },
   serializer
@@ -556,7 +560,8 @@ const updateOperationSpec: msRest.OperationSpec = {
   ],
   queryParameters: [
     Parameters.notify,
-    Parameters.apiVersion
+    Parameters.apiVersion,
+    Parameters.appType
   ],
   headerParameters: [
     Parameters.ifMatch1,
@@ -570,9 +575,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.SubscriptionContract,
+      headersMapper: Mappers.SubscriptionUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SubscriptionUpdateHeaders
     }
   },
   serializer
@@ -669,10 +678,12 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.SubscriptionKeysContract
+      bodyMapper: Mappers.SubscriptionKeysContract,
+      headersMapper: Mappers.SubscriptionListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.SubscriptionListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..ae8d21a28a76 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -847,9 +847,9 @@ export class Tag {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.TagUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.TagUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -859,7 +859,7 @@ export class Tag {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.TagContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -870,8 +870,8 @@ export class Tag {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -882,7 +882,7 @@ export class Tag {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.TagUpdateResponse>;
   }
 
   /**
@@ -1095,7 +1095,8 @@ const getEntityStateByOperationOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetEntityStateByOperationHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetEntityStateByOperationHeaders
     }
   },
   serializer
@@ -1124,7 +1125,8 @@ const getByOperationOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetByOperationHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetByOperationHeaders
     }
   },
   serializer
@@ -1238,7 +1240,8 @@ const getEntityStateByApiOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetEntityStateByApiHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetEntityStateByApiHeaders
     }
   },
   serializer
@@ -1266,7 +1269,8 @@ const getByApiOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetByApiHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetByApiHeaders
     }
   },
   serializer
@@ -1298,7 +1302,8 @@ const assignToApiOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagAssignToApiHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagAssignToApiHeaders
     }
   },
   serializer
@@ -1380,7 +1385,8 @@ const getEntityStateByProductOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetEntityStateByProductHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetEntityStateByProductHeaders
     }
   },
   serializer
@@ -1408,7 +1414,8 @@ const getByProductOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetByProductHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetByProductHeaders
     }
   },
   serializer
@@ -1519,7 +1526,8 @@ const getEntityStateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetEntityStateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetEntityStateHeaders
     }
   },
   serializer
@@ -1546,7 +1554,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagGetHeaders
     }
   },
   serializer
@@ -1585,7 +1594,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TagCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagCreateOrUpdateHeaders
     }
   },
   serializer
@@ -1615,9 +1625,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.TagContract,
+      headersMapper: Mappers.TagUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TagUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index c18facbb8662..01394e97ddad 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -98,9 +98,9 @@ export class TenantAccess {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.TenantAccessUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.TenantAccessUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -109,7 +109,7 @@ export class TenantAccess {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -119,8 +119,8 @@ export class TenantAccess {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -130,7 +130,7 @@ export class TenantAccess {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.TenantAccessUpdateResponse>;
   }
 
   /**
@@ -252,7 +252,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TenantAccessGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessGetEntityTagHeaders
     }
   },
   serializer
@@ -279,7 +280,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TenantAccessGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessGetHeaders
     }
   },
   serializer
@@ -309,9 +311,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.AccessInformationContract,
+      headersMapper: Mappers.TenantAccessUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessUpdateHeaders
     }
   },
   serializer
@@ -386,7 +392,8 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TenantAccessListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
index 3a031c37eb46..768186ddca3c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccessGit.ts
@@ -178,7 +178,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TenantAccessGitGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessGitGetHeaders
     }
   },
   serializer
@@ -253,7 +254,8 @@ const listSecretsOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.TenantAccessGitListSecretsHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.TenantAccessGitListSecretsHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
index 43a8c279ccc7..93696581a46f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -179,9 +179,9 @@ export class User {
    * @param ifMatch ETag of the Entity. ETag should match the current entity state from the header
    * response of the GET request or it should be * for unconditional update.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.UserUpdateResponse>
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase): Promise<Models.UserUpdateResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -191,7 +191,7 @@ export class User {
    * response of the GET request or it should be * for unconditional update.
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<void>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, callback: msRest.ServiceCallback<Models.UserContract>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -202,8 +202,8 @@ export class User {
    * @param options The optional parameters
    * @param callback The callback
    */
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
+  update(resourceGroupName: string, serviceName: string, userId: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class User {
         options
       },
       updateOperationSpec,
-      callback);
+      callback) as Promise<Models.UserUpdateResponse>;
   }
 
   /**
@@ -417,7 +417,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.UserGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.UserGetEntityTagHeaders
     }
   },
   serializer
@@ -444,7 +445,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.UserGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.UserGetHeaders
     }
   },
   serializer
@@ -460,6 +462,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
+    Parameters.notify,
     Parameters.apiVersion
   ],
   headerParameters: [
@@ -483,7 +486,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.UserCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.UserCreateOrUpdateHeaders
     }
   },
   serializer
@@ -513,9 +517,13 @@ const updateOperationSpec: msRest.OperationSpec = {
     }
   },
   responses: {
-    204: {},
+    200: {
+      bodyMapper: Mappers.UserContract,
+      headersMapper: Mappers.UserUpdateHeaders
+    },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.UserUpdateHeaders
     }
   },
   serializer
@@ -533,7 +541,8 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
   queryParameters: [
     Parameters.deleteSubscriptions,
     Parameters.notify,
-    Parameters.apiVersion
+    Parameters.apiVersion,
+    Parameters.appType
   ],
   headerParameters: [
     Parameters.ifMatch1,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
index d9e3dbdaf146..a119f7abbd34 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/userConfirmationPassword.ts
@@ -9,6 +9,7 @@
  */
 
 import * as msRest from "@azure/ms-rest-js";
+import * as Models from "../models";
 import * as Mappers from "../models/userConfirmationPasswordMappers";
 import * as Parameters from "../models/parameters";
 import { ApiManagementClientContext } from "../apiManagementClientContext";
@@ -33,7 +34,7 @@ export class UserConfirmationPassword {
    * @param [options] The optional parameters
    * @returns Promise<msRest.RestResponse>
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserConfirmationPasswordSendOptionalParams): Promise<msRest.RestResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -48,8 +49,8 @@ export class UserConfirmationPassword {
    * @param options The optional parameters
    * @param callback The callback
    */
-  send(resourceGroupName: string, serviceName: string, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  send(resourceGroupName: string, serviceName: string, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  send(resourceGroupName: string, serviceName: string, userId: string, options: Models.UserConfirmationPasswordSendOptionalParams, callback: msRest.ServiceCallback<void>): void;
+  send(resourceGroupName: string, serviceName: string, userId: string, options?: Models.UserConfirmationPasswordSendOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -74,7 +75,8 @@ const sendOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion
+    Parameters.apiVersion,
+    Parameters.appType
   ],
   headerParameters: [
     Parameters.acceptLanguage