diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
index 10326b642115..cb1183adab8f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiDiagnosticMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticCollection,
   DiagnosticContract,
   EmailTemplateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
index bcf025c555ad..a44e84320662 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueAttachmentMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
index 94550c31a779..0d8eb23539b5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueCommentMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
index f7f41cb57c0b..340867a06f52 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiIssueMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
index 6a3825a39a8b..afb2c0c7a3ff 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiManagementServiceMappers.ts
@@ -43,6 +43,8 @@ export {
   CertificateContract,
   CertificateInformation,
   CloudError,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
index 55e0a2e7f17c..28be2751f44c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiMappers.ts
@@ -46,6 +46,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
index 9fea7c297f13..4502f81c5733 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
index d839005cf4d1..c9d67fb23549 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiOperationPolicyMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
index bd3f2e158024..36a171303506 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiPolicyMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
index 04e121e71a4e..ac72bf25f9ac 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiProductMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
index 3e5875867ed8..f8183861d97b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiReleaseMappers.ts
@@ -40,6 +40,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
index 97c1c14738d4..2514161500bd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiSchemaMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
index 95bcfc931452..573cab7e0c31 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiTagDescriptionMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
index 1b1849674045..71f6c452efe8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/apiVersionSetMappers.ts
@@ -41,6 +41,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
index ff6bb419d095..1de536773f54 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/authorizationServerMappers.ts
@@ -41,6 +41,8 @@ export {
   CertificateContract,
   CertificateInformation,
   ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
index 96dc17f4f00d..9a83d94ac4d0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/backendMappers.ts
@@ -41,6 +41,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
index 925c1c8e995b..65fe4928331b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/cacheMappers.ts
@@ -41,6 +41,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
index dc1c4422c33d..5bfe43d99281 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/certificateMappers.ts
@@ -41,6 +41,8 @@ export {
   CertificateGetEntityTagHeaders,
   CertificateGetHeaders,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
index fec1853e62b2..6324586044aa 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/delegationSettingsMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DelegationSettingsGetEntityTagHeaders,
   DelegationSettingsGetHeaders,
   DiagnosticContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
index 1001dfb6804e..69709c37b59e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/diagnosticMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticCollection,
   DiagnosticContract,
   DiagnosticCreateOrUpdateHeaders,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
index e95c43143839..6798ca5d8674 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/emailTemplateMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateCollection,
   EmailTemplateContract,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
index 3923b13a0f3c..ea6d38fb50ca 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayApiMappers.ts
@@ -37,6 +37,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
index 8a77fa12242c..532d69dba203 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayHostnameConfigurationMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
index c1c140d0632a..f6d795e8a22e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/gatewayMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
index cc5873a72832..12905c2477db 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/groupMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
index 2eeab6b3baf7..63e0d2d4ece5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/groupUserMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
index 674b64208ffa..8ac9ba7bdb3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/identityProviderMappers.ts
@@ -37,6 +37,8 @@ export {
   CertificateContract,
   CertificateInformation,
   ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index 00a9ffa0200a..54c5c3d2e2e8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -4047,7 +4047,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;
   /**
@@ -4117,6 +4118,20 @@ export interface QuotaCounterValueContractProperties {
   kbTransferred?: number;
 }
 
+/**
+ * Quota counter value details.
+ */
+export interface QuotaCounterValueUpdateContract {
+  /**
+   * Number of times Counter was called.
+   */
+  callsCount?: number;
+  /**
+   * Data Transferred in KiloBytes.
+   */
+  kbTransferred?: number;
+}
+
 /**
  * Quota counter details.
  */
@@ -4421,7 +4436,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 +4763,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;
   /**
@@ -4794,6 +4810,74 @@ export interface QuotaCounterValueContract {
   kbTransferred?: number;
 }
 
+/**
+ * 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;
+}
+
+/**
+ * Paged list of content types.
+ */
+export interface ContentTypeCollection {
+  /**
+   * Collection of content types.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly value?: ContentTypeContract[];
+  /**
+   * Next page link, if any.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextLink?: string;
+}
+
+/**
+ * Content type contract details.
+ */
+export interface ContentItemContract extends Resource {
+  /**
+   * Properties of the content item.
+   */
+  properties?: { [propertyName: string]: any };
+}
+
+/**
+ * Paged list of content items.
+ */
+export interface ContentItemCollection {
+  /**
+   * Collection of content items.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly value?: ContentItemContract[];
+  /**
+   * Next page link, if any.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextLink?: string;
+}
+
 /**
  * Optional Parameters.
  */
@@ -6365,6 +6449,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 +6467,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;
 }
 
 /**
@@ -6445,6 +6541,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 +6564,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;
 }
 
 /**
@@ -6515,6 +6621,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.
  */
@@ -8461,11 +8579,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.
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
index 997f8c08da60..7713a6e3b92c 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/issueMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
index f6fa57322949..1ce4bdb3ea68 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/loggerMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 76d5c775cee6..5850f78f223e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -7083,6 +7083,28 @@ export const QuotaCounterValueContractProperties: 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 QuotaCounterContract: msRest.CompositeMapper = {
   serializedName: "QuotaCounterContract",
   type: {
@@ -8184,6 +8206,129 @@ export const QuotaCounterValueContract: msRest.CompositeMapper = {
   }
 };
 
+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 ContentTypeCollection: msRest.CompositeMapper = {
+  serializedName: "ContentTypeCollection",
+  type: {
+    name: "Composite",
+    className: "ContentTypeCollection",
+    modelProperties: {
+      value: {
+        readOnly: true,
+        serializedName: "value",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ContentTypeContract"
+            }
+          }
+        }
+      },
+      nextLink: {
+        readOnly: true,
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+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 ContentItemCollection: msRest.CompositeMapper = {
+  serializedName: "ContentItemCollection",
+  type: {
+    name: "Composite",
+    className: "ContentItemCollection",
+    modelProperties: {
+      value: {
+        readOnly: true,
+        serializedName: "value",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ContentItemContract"
+            }
+          }
+        }
+      },
+      nextLink: {
+        readOnly: true,
+        serializedName: "nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const ApiGetEntityTagHeaders: msRest.CompositeMapper = {
   serializedName: "api-getentitytag-headers",
   type: {
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
index ff5563e54053..f230648fc624 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/namedValueMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
index b82a3ea1eab4..943a3481ca3a 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
index 16c005715b18..9250ca18a948 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientEmailMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
index a1fb53d824c6..f406fce67fa2 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/notificationRecipientUserMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
index 4ffb64cf0376..7e81a7536b1f 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/openIdConnectProviderMappers.ts
@@ -37,6 +37,8 @@ export {
   CertificateContract,
   CertificateInformation,
   ClientSecretContract,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts b/sdk/apimanagement/arm-apimanagement/src/models/parameters.ts
index 40b557d6bd63..7ce00f27aec6 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: {
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
index b0eb43eb71d2..353a402df7f4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/policyDescriptionMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
index 9caf6ee9ab57..82a5a196cdba 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/policyMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
index 76b1488cc812..8585264f0890 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productApiMappers.ts
@@ -37,6 +37,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
index f48788d98b20..c667d3d9f690 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productGroupMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
index 87092fa3ab06..365c68758b28 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productMappers.ts
@@ -39,6 +39,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
index 64ac202f796a..a1804c463e60 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productPolicyMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
index e21019e9e856..ba684f723705 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/productSubscriptionsMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
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..77e28090e544 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/signInSettingsMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
index 050a808f4053..d431bc90c083 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/signUpSettingsMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
index eda090037b74..fbbcfc4d6d95 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/subscriptionMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
index 887095666625..3c6f61201952 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/tagMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
index f48788d98b20..c667d3d9f690 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userGroupMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
index d2d15d6016db..4bf235b68c3b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
index e21019e9e856..ba684f723705 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/userSubscriptionMappers.ts
@@ -36,6 +36,8 @@ export {
   CertificateConfiguration,
   CertificateContract,
   CertificateInformation,
+  ContentItemContract,
+  ContentTypeContract,
   DiagnosticContract,
   EmailTemplateContract,
   EmailTemplateParametersContractProperties,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
index 7dc3aea4f799..1e8af587c168 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/api.ts
@@ -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
@@ -569,7 +571,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..cf16c0829fc6 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiDiagnostic.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
index e6bc0634c75f..2a1c5a74f38d 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiIssue.ts
@@ -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
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..41e7c276ebf1 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiOperation.ts
@@ -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
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..07a760d3ae07 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiRelease.ts
@@ -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
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..e5b00d9bd1c5 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/apiVersionSet.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
index 6ec8faf37b10..2a64279442b0 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/authorizationServer.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
index 660d0124c797..2dba670f2a81 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/backend.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
index 3cb264df2e6a..9815f8800d73 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/cache.ts
@@ -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
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/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/diagnostic.ts b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
index e4b86f89bc26..c76bf50561aa 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/diagnostic.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
index fb6ba47d4b55..643e0e6b66b8 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/emailTemplate.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts b/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
index e2e9bc6fe6a3..94693e6eb85b 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gateway.ts
@@ -478,7 +478,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayGetEntityTagHeaders
     }
   },
   serializer
@@ -505,7 +506,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayGetHeaders
     }
   },
   serializer
@@ -544,7 +546,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayCreateOrUpdateHeaders
     }
   },
   serializer
@@ -629,7 +632,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..500a933e87b7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayApi.ts
@@ -274,7 +274,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..3540c86084aa 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/gatewayHostnameConfiguration.ts
@@ -334,7 +334,8 @@ const getEntityTagOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationGetEntityTagHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationGetEntityTagHeaders
     }
   },
   serializer
@@ -362,7 +363,8 @@ const getOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationGetHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationGetHeaders
     }
   },
   serializer
@@ -401,7 +403,8 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.GatewayHostnameConfigurationCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.GatewayHostnameConfigurationCreateOrUpdateHeaders
     }
   },
   serializer
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
index 13b9fec30dbe..0fc297a97406 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/group.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
index b1d63a641d45..b5708436b6dd 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/identityProvider.ts
@@ -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
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..7bf39b6b9cf4 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/logger.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts b/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
index 741f6c25bc54..e6a46de0fe42 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/namedValue.ts
@@ -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
@@ -487,7 +489,8 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
       headersMapper: Mappers.NamedValueCreateOrUpdateHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse
+      bodyMapper: Mappers.ErrorResponse,
+      headersMapper: Mappers.NamedValueCreateOrUpdateHeaders
     }
   },
   serializer
@@ -528,7 +531,8 @@ const beginUpdateOperationSpec: msRest.OperationSpec = {
       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..2895b372ac38 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/openIdConnectProvider.ts
@@ -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
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..5e202513f523 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/product.ts
@@ -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
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..a5a22b261fda 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByCounterKeys.ts
@@ -85,7 +85,7 @@ export class QuotaByCounterKeys {
    * @param [options] The optional parameters
    * @returns Promise<msRest.RestResponse>
    */
-  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<msRest.RestResponse>;
   /**
    * @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<void>): 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<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   requestBody: {
     parameterPath: "parameters",
     mapper: {
-      ...Mappers.QuotaCounterValueContractProperties,
+      ...Mappers.QuotaCounterValueUpdateContract,
       required: true
     }
   },
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
index c7bf3dfa545a..4d565f367607 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/quotaByPeriodKeys.ts
@@ -89,7 +89,7 @@ export class QuotaByPeriodKeys {
    * @param [options] The optional parameters
    * @returns Promise<msRest.RestResponse>
    */
-  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<msRest.RestResponse>;
   /**
    * @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<void>): 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<void>): void;
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, parameters: Models.QuotaCounterValueUpdateContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -178,7 +178,7 @@ const updateOperationSpec: msRest.OperationSpec = {
   requestBody: {
     parameterPath: "parameters",
     mapper: {
-      ...Mappers.QuotaCounterValueContractProperties,
+      ...Mappers.QuotaCounterValueUpdateContract,
       required: true
     }
   },
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..ef1e7813b607 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/subscription.ts
@@ -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,
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
index 78a9e2742d66..8031870de245 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tag.ts
@@ -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
diff --git a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
index c18facbb8662..1401b0dfa498 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/tenantAccess.ts
@@ -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
@@ -386,7 +388,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..a66666c0f80e 100644
--- a/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/operations/user.ts
@@ -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
@@ -533,7 +537,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