diff --git a/packages/@azure/arm-apimanagement/lib/apiManagementClientContext.ts b/packages/@azure/arm-apimanagement/lib/apiManagementClientContext.ts
index 50989c5165d0..56a4c2d2b361 100644
--- a/packages/@azure/arm-apimanagement/lib/apiManagementClientContext.ts
+++ b/packages/@azure/arm-apimanagement/lib/apiManagementClientContext.ts
@@ -13,7 +13,7 @@ import * as msRest from "ms-rest-js";
 import * as msRestAzure from "ms-rest-azure-js";
 
 const packageName = "@azure/arm-apimanagement";
-const packageVersion = "1.0.0-preview";
+const packageVersion = "0.1.0";
 
 export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
diff --git a/packages/@azure/arm-apimanagement/lib/models/index.ts b/packages/@azure/arm-apimanagement/lib/models/index.ts
index 0f1b3ae76aaa..80a61ab8f037 100644
--- a/packages/@azure/arm-apimanagement/lib/models/index.ts
+++ b/packages/@azure/arm-apimanagement/lib/models/index.ts
@@ -3390,10 +3390,8 @@ export interface UserEntityBaseParameters {
   /**
    * @member {UserIdentityContract[]} [identities] Collection of user
    * identities.
-   * **NOTE: This property will not be serialized. It can only be populated by
-   * the server.**
    */
-  readonly identities?: UserIdentityContract[];
+  identities?: UserIdentityContract[];
 }
 
 /**
@@ -3420,10 +3418,8 @@ export interface UserContract extends Resource {
   /**
    * @member {UserIdentityContract[]} [identities] Collection of user
    * identities.
-   * **NOTE: This property will not be serialized. It can only be populated by
-   * the server.**
    */
-  readonly identities?: UserIdentityContract[];
+  identities?: UserIdentityContract[];
   /**
    * @member {string} [firstName] First name.
    */
@@ -4950,10 +4946,8 @@ export interface UserCreateParameters {
   /**
    * @member {UserIdentityContract[]} [identities] Collection of user
    * identities.
-   * **NOTE: This property will not be serialized. It can only be populated by
-   * the server.**
    */
-  readonly identities?: UserIdentityContract[];
+  identities?: UserIdentityContract[];
   /**
    * @member {string} email Email address. Must not be empty and must be unique
    * within the service instance.
@@ -5037,10 +5031,8 @@ export interface UserUpdateParameters {
   /**
    * @member {UserIdentityContract[]} [identities] Collection of user
    * identities.
-   * **NOTE: This property will not be serialized. It can only be populated by
-   * the server.**
    */
-  readonly identities?: UserIdentityContract[];
+  identities?: UserIdentityContract[];
   /**
    * @member {string} [email] Email address. Must not be empty and must be
    * unique within the service instance.
@@ -8642,35 +8634,10 @@ export interface ApiVersionSetCollection extends Array<ApiVersionSetContract> {
 /**
  * Defines values for PolicyContentFormat.
  * Possible values include: 'xml', 'xml-link', 'rawxml', 'rawxml-link'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: PolicyContentFormat =
- * <PolicyContentFormat>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum PolicyContentFormat {
-  /**
-   * The contents are inline and Content type is an XML document.
-   */
-  Xml = 'xml',
-  /**
-   * The policy XML document is hosted on a http endpoint accessible from the
-   * API Management service.
-   */
-  XmlLink = 'xml-link',
-  /**
-   * The contents are inline and Content type is a non XML encoded policy
-   * document.
-   */
-  Rawxml = 'rawxml',
-  /**
-   * The policy document is not Xml encoded and is hosted on a http endpoint
-   * accessible from the API Management service.
-   */
-  RawxmlLink = 'rawxml-link',
-}
+export type PolicyContentFormat = 'xml' | 'xml-link' | 'rawxml' | 'rawxml-link';
 
 /**
  * Defines values for Protocol.
@@ -8678,164 +8645,56 @@ export enum PolicyContentFormat {
  * @readonly
  * @enum {string}
  */
-export enum Protocol {
-  Http = 'http',
-  Https = 'https',
-}
+export type Protocol = 'http' | 'https';
 
 /**
  * Defines values for ContentFormat.
- * Possible values include: 'wadl-xml', 'wadl-link-json', 'swagger-json',
- * 'swagger-link-json', 'wsdl', 'wsdl-link'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: ContentFormat =
- * <ContentFormat>"someUnknownValueThatWillStillBeValid";
+ * Possible values include: 'wadl-xml', 'wadl-link-json', 'swagger-json', 'swagger-link-json',
+ * 'wsdl', 'wsdl-link'
  * @readonly
  * @enum {string}
  */
-export enum ContentFormat {
-  /**
-   * The contents are inline and Content type is a WADL document.
-   */
-  WadlXml = 'wadl-xml',
-  /**
-   * The WADL document is hosted on a publicly accessible internet address.
-   */
-  WadlLinkJson = 'wadl-link-json',
-  /**
-   * The contents are inline and Content Type is a OpenApi 2.0 Document.
-   */
-  SwaggerJson = 'swagger-json',
-  /**
-   * The Open Api 2.0 document is hosted on a publicly accessible internet
-   * address.
-   */
-  SwaggerLinkJson = 'swagger-link-json',
-  /**
-   * The contents are inline and the document is a WSDL/Soap document.
-   */
-  Wsdl = 'wsdl',
-  /**
-   * The WSDL document is hosted on a publicly accessible internet address.
-   */
-  WsdlLink = 'wsdl-link',
-}
+export type ContentFormat = 'wadl-xml' | 'wadl-link-json' | 'swagger-json' | 'swagger-link-json' | 'wsdl' | 'wsdl-link';
 
 /**
  * Defines values for SoapApiType.
  * Possible values include: 'SoapToRest', 'SoapPassThrough'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: SoapApiType =
- * <SoapApiType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum SoapApiType {
-  /**
-   * Imports a SOAP API having a RESTful front end.
-   */
-  SoapToRest = 'http',
-  /**
-   * Imports the Soap API having a SOAP front end.
-   */
-  SoapPassThrough = 'soap',
-}
+export type SoapApiType = 'http' | 'soap';
 
 /**
  * Defines values for BearerTokenSendingMethods.
  * Possible values include: 'authorizationHeader', 'query'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: BearerTokenSendingMethods =
- * <BearerTokenSendingMethods>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum BearerTokenSendingMethods {
-  /**
-   * Access token will be transmitted in the Authorization header using Bearer
-   * schema
-   */
-  AuthorizationHeader = 'authorizationHeader',
-  /**
-   * Access token will be transmitted as query parameters.
-   */
-  Query = 'query',
-}
+export type BearerTokenSendingMethods = 'authorizationHeader' | 'query';
 
 /**
  * Defines values for ApiType.
  * Possible values include: 'http', 'soap'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: ApiType = <ApiType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum ApiType {
-  Http = 'http',
-  Soap = 'soap',
-}
+export type ApiType = 'http' | 'soap';
 
 /**
  * Defines values for State.
  * Possible values include: 'proposed', 'open', 'removed', 'resolved', 'closed'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: State = <State>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum State {
-  /**
-   * The issue is proposed.
-   */
-  Proposed = 'proposed',
-  /**
-   * The issue is opened.
-   */
-  Open = 'open',
-  /**
-   * The issue was removed.
-   */
-  Removed = 'removed',
-  /**
-   * The issue is now resolved.
-   */
-  Resolved = 'resolved',
-  /**
-   * The issue was closed.
-   */
-  Closed = 'closed',
-}
+export type State = 'proposed' | 'open' | 'removed' | 'resolved' | 'closed';
 
 /**
  * Defines values for LoggerType.
  * Possible values include: 'azureEventHub', 'applicationInsights'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: LoggerType = <LoggerType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum LoggerType {
-  /**
-   * Azure Event Hub as log destination.
-   */
-  AzureEventHub = 'azureEventHub',
-  /**
-   * Azure Application Insights as log destination.
-   */
-  ApplicationInsights = 'applicationInsights',
-}
+export type LoggerType = 'azureEventHub' | 'applicationInsights';
 
 /**
  * Defines values for ProductState.
@@ -8843,122 +8702,48 @@ export enum LoggerType {
  * @readonly
  * @enum {string}
  */
-export enum ProductState {
-  NotPublished = 'notPublished',
-  Published = 'published',
-}
+export type ProductState = 'notPublished' | 'published';
 
 /**
  * Defines values for GrantType.
- * Possible values include: 'authorizationCode', 'implicit',
- * 'resourceOwnerPassword', 'clientCredentials'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: GrantType = <GrantType>"someUnknownValueThatWillStillBeValid";
+ * Possible values include: 'authorizationCode', 'implicit', 'resourceOwnerPassword',
+ * 'clientCredentials'
  * @readonly
  * @enum {string}
  */
-export enum GrantType {
-  /**
-   * Authorization Code Grant flow as described
-   * https://tools.ietf.org/html/rfc6749#section-4.1.
-   */
-  AuthorizationCode = 'authorizationCode',
-  /**
-   * Implicit Code Grant flow as described
-   * https://tools.ietf.org/html/rfc6749#section-4.2.
-   */
-  Implicit = 'implicit',
-  /**
-   * Resource Owner Password Grant flow as described
-   * https://tools.ietf.org/html/rfc6749#section-4.3.
-   */
-  ResourceOwnerPassword = 'resourceOwnerPassword',
-  /**
-   * Client Credentials Grant flow as described
-   * https://tools.ietf.org/html/rfc6749#section-4.4.
-   */
-  ClientCredentials = 'clientCredentials',
-}
+export type GrantType = 'authorizationCode' | 'implicit' | 'resourceOwnerPassword' | 'clientCredentials';
 
 /**
  * Defines values for AuthorizationMethod.
- * Possible values include: 'HEAD', 'OPTIONS', 'TRACE', 'GET', 'POST', 'PUT',
- * 'PATCH', 'DELETE'
+ * Possible values include: 'HEAD', 'OPTIONS', 'TRACE', 'GET', 'POST', 'PUT', 'PATCH', 'DELETE'
  * @readonly
  * @enum {string}
  */
-export enum AuthorizationMethod {
-  HEAD = 'HEAD',
-  OPTIONS = 'OPTIONS',
-  TRACE = 'TRACE',
-  GET = 'GET',
-  POST = 'POST',
-  PUT = 'PUT',
-  PATCH = 'PATCH',
-  DELETE = 'DELETE',
-}
+export type AuthorizationMethod = 'HEAD' | 'OPTIONS' | 'TRACE' | 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 
 /**
  * Defines values for ClientAuthenticationMethod.
  * Possible values include: 'Basic', 'Body'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: ClientAuthenticationMethod =
- * <ClientAuthenticationMethod>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum ClientAuthenticationMethod {
-  /**
-   * Basic Client Authentication method.
-   */
-  Basic = 'Basic',
-  /**
-   * Body based Authentication method.
-   */
-  Body = 'Body',
-}
+export type ClientAuthenticationMethod = 'Basic' | 'Body';
 
 /**
  * Defines values for BearerTokenSendingMethod.
  * Possible values include: 'authorizationHeader', 'query'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: BearerTokenSendingMethod =
- * <BearerTokenSendingMethod>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum BearerTokenSendingMethod {
-  AuthorizationHeader = 'authorizationHeader',
-  Query = 'query',
-}
+export type BearerTokenSendingMethod = 'authorizationHeader' | 'query';
 
 /**
  * Defines values for BackendProtocol.
  * Possible values include: 'http', 'soap'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: BackendProtocol =
- * <BackendProtocol>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum BackendProtocol {
-  /**
-   * The Backend is a RESTful service.
-   */
-  Http = 'http',
-  /**
-   * The Backend is a SOAP service.
-   */
-  Soap = 'soap',
-}
+export type BackendProtocol = 'http' | 'soap';
 
 /**
  * Defines values for HostnameType.
@@ -8966,68 +8751,23 @@ export enum BackendProtocol {
  * @readonly
  * @enum {string}
  */
-export enum HostnameType {
-  Proxy = 'Proxy',
-  Portal = 'Portal',
-  Management = 'Management',
-  Scm = 'Scm',
-}
+export type HostnameType = 'Proxy' | 'Portal' | 'Management' | 'Scm';
 
 /**
  * Defines values for SkuType.
  * Possible values include: 'Developer', 'Standard', 'Premium', 'Basic'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: SkuType = <SkuType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum SkuType {
-  /**
-   * Developer SKU of Api Management.
-   */
-  Developer = 'Developer',
-  /**
-   * Standard SKU of Api Management.
-   */
-  Standard = 'Standard',
-  /**
-   * Premium SKU of Api Management.
-   */
-  Premium = 'Premium',
-  /**
-   * Basic SKU of Api Management.
-   */
-  Basic = 'Basic',
-}
+export type SkuType = 'Developer' | 'Standard' | 'Premium' | 'Basic';
 
 /**
  * Defines values for VirtualNetworkType.
  * Possible values include: 'None', 'External', 'Internal'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: VirtualNetworkType =
- * <VirtualNetworkType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum VirtualNetworkType {
-  /**
-   * The service is not part of any Virtual Network.
-   */
-  None = 'None',
-  /**
-   * The service is part of Virtual Network and it is accessible from Internet.
-   */
-  External = 'External',
-  /**
-   * The service is part of Virtual Network and it is only accessible from
-   * within the virtual network.
-   */
-  Internal = 'Internal',
-}
+export type VirtualNetworkType = 'None' | 'External' | 'Internal';
 
 /**
  * Defines values for NameAvailabilityReason.
@@ -9035,11 +8775,7 @@ export enum VirtualNetworkType {
  * @readonly
  * @enum {string}
  */
-export enum NameAvailabilityReason {
-  Valid = 'Valid',
-  Invalid = 'Invalid',
-  AlreadyExists = 'AlreadyExists',
-}
+export type NameAvailabilityReason = 'Valid' | 'Invalid' | 'AlreadyExists';
 
 /**
  * Defines values for GroupType.
@@ -9047,136 +8783,47 @@ export enum NameAvailabilityReason {
  * @readonly
  * @enum {string}
  */
-export enum GroupType {
-  Custom = 'custom',
-  System = 'system',
-  External = 'external',
-}
+export type GroupType = 'custom' | 'system' | 'external';
 
 /**
  * Defines values for Confirmation.
  * Possible values include: 'signup', 'invite'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: Confirmation =
- * <Confirmation>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum Confirmation {
-  /**
-   * Send an e-mail to the user confirming they have successfully signed up.
-   */
-  Signup = 'signup',
-  /**
-   * Send an e-mail inviting the user to sign-up and complete registration.
-   */
-  Invite = 'invite',
-}
+export type Confirmation = 'signup' | 'invite';
 
 /**
  * Defines values for UserState.
  * Possible values include: 'active', 'blocked', 'pending', 'deleted'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: UserState = <UserState>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum UserState {
-  /**
-   * User state is active.
-   */
-  Active = 'active',
-  /**
-   * User is blocked. Blocked users cannot authenticate at developer portal or
-   * call API.
-   */
-  Blocked = 'blocked',
-  /**
-   * User account is pending. Requires identity confirmation before it can be
-   * made active.
-   */
-  Pending = 'pending',
-  /**
-   * User account is closed. All identities and related entities are removed.
-   */
-  Deleted = 'deleted',
-}
+export type UserState = 'active' | 'blocked' | 'pending' | 'deleted';
 
 /**
  * Defines values for IdentityProviderType.
- * Possible values include: 'facebook', 'google', 'microsoft', 'twitter',
- * 'aad', 'aadB2C'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: IdentityProviderType =
- * <IdentityProviderType>"someUnknownValueThatWillStillBeValid";
+ * Possible values include: 'facebook', 'google', 'microsoft', 'twitter', 'aad', 'aadB2C'
  * @readonly
  * @enum {string}
  */
-export enum IdentityProviderType {
-  /**
-   * Facebook as Identity provider.
-   */
-  Facebook = 'facebook',
-  /**
-   * Google as Identity provider.
-   */
-  Google = 'google',
-  /**
-   * Microsoft Live as Identity provider.
-   */
-  Microsoft = 'microsoft',
-  /**
-   * Twitter as Identity provider.
-   */
-  Twitter = 'twitter',
-  /**
-   * Azure Active Directory as Identity provider.
-   */
-  Aad = 'aad',
-  /**
-   * Azure Active Directory B2C as Identity provider.
-   */
-  AadB2C = 'aadB2C',
-}
+export type IdentityProviderType = 'facebook' | 'google' | 'microsoft' | 'twitter' | 'aad' | 'aadB2C';
 
 /**
  * Defines values for ConnectivityStatusType.
  * Possible values include: 'initializing', 'success', 'failure'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: ConnectivityStatusType =
- * <ConnectivityStatusType>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum ConnectivityStatusType {
-  Initializing = 'initializing',
-  Success = 'success',
-  Failure = 'failure',
-}
+export type ConnectivityStatusType = 'initializing' | 'success' | 'failure';
 
 /**
  * Defines values for SubscriptionState.
- * Possible values include: 'suspended', 'active', 'expired', 'submitted',
- * 'rejected', 'cancelled'
+ * Possible values include: 'suspended', 'active', 'expired', 'submitted', 'rejected', 'cancelled'
  * @readonly
  * @enum {string}
  */
-export enum SubscriptionState {
-  Suspended = 'suspended',
-  Active = 'active',
-  Expired = 'expired',
-  Submitted = 'submitted',
-  Rejected = 'rejected',
-  Cancelled = 'cancelled',
-}
+export type SubscriptionState = 'suspended' | 'active' | 'expired' | 'submitted' | 'rejected' | 'cancelled';
 
 /**
  * Defines values for AsyncOperationStatus.
@@ -9184,12 +8831,7 @@ export enum SubscriptionState {
  * @readonly
  * @enum {string}
  */
-export enum AsyncOperationStatus {
-  Started = 'Started',
-  InProgress = 'InProgress',
-  Succeeded = 'Succeeded',
-  Failed = 'Failed',
-}
+export type AsyncOperationStatus = 'Started' | 'InProgress' | 'Succeeded' | 'Failed';
 
 /**
  * Defines values for KeyType.
@@ -9197,124 +8839,40 @@ export enum AsyncOperationStatus {
  * @readonly
  * @enum {string}
  */
-export enum KeyType {
-  Primary = 'primary',
-  Secondary = 'secondary',
-}
+export type KeyType = 'primary' | 'secondary';
 
 /**
  * Defines values for VersioningScheme.
  * Possible values include: 'Segment', 'Query', 'Header'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: VersioningScheme =
- * <VersioningScheme>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum VersioningScheme {
-  /**
-   * The API Version is passed in a path segment.
-   */
-  Segment = 'Segment',
-  /**
-   * The API Version is passed in a query parameter.
-   */
-  Query = 'Query',
-  /**
-   * The API Version is passed in a HTTP header.
-   */
-  Header = 'Header',
-}
+export type VersioningScheme = 'Segment' | 'Query' | 'Header';
 
 /**
  * Defines values for TemplateName.
- * Possible values include: 'applicationApprovedNotificationMessage',
- * 'accountClosedDeveloper',
- * 'quotaLimitApproachingDeveloperNotificationMessage',
- * 'newDeveloperNotificationMessage', 'emailChangeIdentityDefault',
- * 'inviteUserNotificationMessage', 'newCommentNotificationMessage',
+ * Possible values include: 'applicationApprovedNotificationMessage', 'accountClosedDeveloper',
+ * 'quotaLimitApproachingDeveloperNotificationMessage', 'newDeveloperNotificationMessage',
+ * 'emailChangeIdentityDefault', 'inviteUserNotificationMessage', 'newCommentNotificationMessage',
  * 'confirmSignUpIdentityDefault', 'newIssueNotificationMessage',
  * 'purchaseDeveloperNotificationMessage', 'passwordResetIdentityDefault',
- * 'passwordResetByAdminNotificationMessage',
- * 'rejectDeveloperNotificationMessage', 'requestDeveloperNotificationMessage'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: TemplateName =
- * <TemplateName>"someUnknownValueThatWillStillBeValid";
+ * 'passwordResetByAdminNotificationMessage', 'rejectDeveloperNotificationMessage',
+ * 'requestDeveloperNotificationMessage'
  * @readonly
  * @enum {string}
  */
-export enum TemplateName {
-  ApplicationApprovedNotificationMessage = 'applicationApprovedNotificationMessage',
-  AccountClosedDeveloper = 'accountClosedDeveloper',
-  QuotaLimitApproachingDeveloperNotificationMessage = 'quotaLimitApproachingDeveloperNotificationMessage',
-  NewDeveloperNotificationMessage = 'newDeveloperNotificationMessage',
-  EmailChangeIdentityDefault = 'emailChangeIdentityDefault',
-  InviteUserNotificationMessage = 'inviteUserNotificationMessage',
-  NewCommentNotificationMessage = 'newCommentNotificationMessage',
-  ConfirmSignUpIdentityDefault = 'confirmSignUpIdentityDefault',
-  NewIssueNotificationMessage = 'newIssueNotificationMessage',
-  PurchaseDeveloperNotificationMessage = 'purchaseDeveloperNotificationMessage',
-  PasswordResetIdentityDefault = 'passwordResetIdentityDefault',
-  PasswordResetByAdminNotificationMessage = 'passwordResetByAdminNotificationMessage',
-  RejectDeveloperNotificationMessage = 'rejectDeveloperNotificationMessage',
-  RequestDeveloperNotificationMessage = 'requestDeveloperNotificationMessage',
-}
+export type TemplateName = 'applicationApprovedNotificationMessage' | 'accountClosedDeveloper' | 'quotaLimitApproachingDeveloperNotificationMessage' | 'newDeveloperNotificationMessage' | 'emailChangeIdentityDefault' | 'inviteUserNotificationMessage' | 'newCommentNotificationMessage' | 'confirmSignUpIdentityDefault' | 'newIssueNotificationMessage' | 'purchaseDeveloperNotificationMessage' | 'passwordResetIdentityDefault' | 'passwordResetByAdminNotificationMessage' | 'rejectDeveloperNotificationMessage' | 'requestDeveloperNotificationMessage';
 
 /**
  * Defines values for NotificationName.
  * Possible values include: 'RequestPublisherNotificationMessage',
- * 'PurchasePublisherNotificationMessage', 'NewApplicationNotificationMessage',
- * 'BCC', 'NewIssuePublisherNotificationMessage', 'AccountClosedPublisher',
+ * 'PurchasePublisherNotificationMessage', 'NewApplicationNotificationMessage', 'BCC',
+ * 'NewIssuePublisherNotificationMessage', 'AccountClosedPublisher',
  * 'QuotaLimitApproachingPublisherNotificationMessage'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: NotificationName =
- * <NotificationName>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum NotificationName {
-  /**
-   * The following email recipients and users will receive email notifications
-   * about subscription requests for API products requiring approval.
-   */
-  RequestPublisherNotificationMessage = 'RequestPublisherNotificationMessage',
-  /**
-   * The following email recipients and users will receive email notifications
-   * about new API product subscriptions.
-   */
-  PurchasePublisherNotificationMessage = 'PurchasePublisherNotificationMessage',
-  /**
-   * The following email recipients and users will receive email notifications
-   * when new applications are submitted to the application gallery.
-   */
-  NewApplicationNotificationMessage = 'NewApplicationNotificationMessage',
-  /**
-   * The following recipients will receive blind carbon copies of all emails
-   * sent to developers.
-   */
-  BCC = 'BCC',
-  /**
-   * The following email recipients and users will receive email notifications
-   * when a new issue or comment is submitted on the developer portal.
-   */
-  NewIssuePublisherNotificationMessage = 'NewIssuePublisherNotificationMessage',
-  /**
-   * The following email recipients and users will receive email notifications
-   * when developer closes his account.
-   */
-  AccountClosedPublisher = 'AccountClosedPublisher',
-  /**
-   * The following email recipients and users will receive email notifications
-   * when subscription usage gets close to usage quota.
-   */
-  QuotaLimitApproachingPublisherNotificationMessage = 'QuotaLimitApproachingPublisherNotificationMessage',
-}
+export type NotificationName = 'RequestPublisherNotificationMessage' | 'PurchasePublisherNotificationMessage' | 'NewApplicationNotificationMessage' | 'BCC' | 'NewIssuePublisherNotificationMessage' | 'AccountClosedPublisher' | 'QuotaLimitApproachingPublisherNotificationMessage';
 
 /**
  * Defines values for PolicyScopeContract.
@@ -9322,73 +8880,31 @@ export enum NotificationName {
  * @readonly
  * @enum {string}
  */
-export enum PolicyScopeContract {
-  Tenant = 'Tenant',
-  Product = 'Product',
-  Api = 'Api',
-  Operation = 'Operation',
-  All = 'All',
-}
+export type PolicyScopeContract = 'Tenant' | 'Product' | 'Api' | 'Operation' | 'All';
 
 /**
  * Defines values for ExportFormat.
  * Possible values include: 'Swagger', 'Wsdl', 'Wadl'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: ExportFormat =
- * <ExportFormat>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum ExportFormat {
-  /**
-   * Export the Api Definition in OpenApi Specification 2.0 format to the
-   * Storage Blob.
-   */
-  Swagger = 'swagger-link',
-  /**
-   * Export the Api Definition in WSDL Schema to Storage Blob. This is only
-   * supported for APIs of Type `soap`
-   */
-  Wsdl = 'wsdl-link',
-  /**
-   * Export the Api Definition in WADL Schema to Storage Blob.
-   */
-  Wadl = 'wadl-link',
-}
+export type ExportFormat = 'swagger-link' | 'wsdl-link' | 'wadl-link';
 
 /**
  * Defines values for VersioningScheme1.
  * Possible values include: 'Segment', 'Query', 'Header'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: VersioningScheme1 =
- * <VersioningScheme1>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum VersioningScheme1 {
-  Segment = 'Segment',
-  Query = 'Query',
-  Header = 'Header',
-}
+export type VersioningScheme1 = 'Segment' | 'Query' | 'Header';
 
 /**
  * Defines values for StoreName.
  * Possible values include: 'CertificateAuthority', 'Root'
- * There could be more values for this enum apart from the ones defined here.If
- * you want to set a value that is not from the known values then you can do
- * the following:
- * let param: StoreName = <StoreName>"someUnknownValueThatWillStillBeValid";
  * @readonly
  * @enum {string}
  */
-export enum StoreName {
-  CertificateAuthority = 'CertificateAuthority',
-  Root = 'Root',
-}
+export type StoreName = 'CertificateAuthority' | 'Root';
 
 /**
  * Contains response data for the listByService operation.
diff --git a/packages/@azure/arm-apimanagement/lib/models/mappers.ts b/packages/@azure/arm-apimanagement/lib/models/mappers.ts
index fad337c83b88..0125a1000120 100644
--- a/packages/@azure/arm-apimanagement/lib/models/mappers.ts
+++ b/packages/@azure/arm-apimanagement/lib/models/mappers.ts
@@ -4782,7 +4782,6 @@ export const UserEntityBaseParameters: msRest.CompositeMapper = {
         }
       },
       identities: {
-        readOnly: true,
         serializedName: "identities",
         type: {
           name: "Sequence",
@@ -4819,7 +4818,6 @@ export const UserContract: msRest.CompositeMapper = {
         }
       },
       identities: {
-        readOnly: true,
         serializedName: "properties.identities",
         type: {
           name: "Sequence",
@@ -6903,7 +6901,6 @@ export const UserCreateParameters: msRest.CompositeMapper = {
         }
       },
       identities: {
-        readOnly: true,
         serializedName: "properties.identities",
         type: {
           name: "Sequence",
@@ -7029,7 +7026,6 @@ export const UserUpdateParameters: msRest.CompositeMapper = {
         }
       },
       identities: {
-        readOnly: true,
         serializedName: "properties.identities",
         type: {
           name: "Sequence",
diff --git a/packages/@azure/arm-apimanagement/lib/operations/api.ts b/packages/@azure/arm-apimanagement/lib/operations/api.ts
index cd20ab9e953f..998699a4c931 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/api.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/api.ts
@@ -47,7 +47,7 @@ export class Api {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.ApiListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class Api {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Api {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Api {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options: Models.ApiCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiCreateOrUpdateParameter, options?: Models.ApiCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -215,7 +215,7 @@ export class Api {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.ApiUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -262,7 +262,7 @@ export class Api {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: Models.ApiDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: Models.ApiDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -296,7 +296,7 @@ export class Api {
    * @param callback The callback
    */
   listByTags(resourceGroupName: string, serviceName: string, options: Models.ApiListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, options?: Models.ApiListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -325,7 +325,7 @@ export class Api {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ApiListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -353,7 +353,7 @@ export class Api {
    * @param callback The callback
    */
   listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.ApiListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiDiagnostic.ts b/packages/@azure/arm-apimanagement/lib/operations/apiDiagnostic.ts
index 823b64d63dd4..9364c119dbc6 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiDiagnostic.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiDiagnostic.ts
@@ -50,7 +50,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiDiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiDiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -92,7 +92,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiDiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -135,7 +135,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -181,7 +181,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.ApiDiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.ApiDiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -234,7 +234,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -285,7 +285,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -317,7 +317,7 @@ export class ApiDiagnostic {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.ApiDiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiDiagnosticLogger.ts b/packages/@azure/arm-apimanagement/lib/operations/apiDiagnosticLogger.ts
index 0794f793aa5e..b7aaacc2fd0d 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiDiagnosticLogger.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiDiagnosticLogger.ts
@@ -56,7 +56,7 @@ export class ApiDiagnosticLogger {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options: Models.ApiDiagnosticLoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: Models.ApiDiagnosticLoggerListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.ApiDiagnosticLoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, options?: Models.ApiDiagnosticLoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.ApiDiagnosticLoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -102,7 +102,7 @@ export class ApiDiagnosticLogger {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ApiDiagnosticLoggerCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ApiDiagnosticLoggerCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -149,7 +149,7 @@ export class ApiDiagnosticLogger {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.ApiDiagnosticLoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.ApiDiagnosticLoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -196,7 +196,7 @@ export class ApiDiagnosticLogger {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -228,7 +228,7 @@ export class ApiDiagnosticLogger {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.ApiDiagnosticLoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.ApiDiagnosticLoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiExport.ts b/packages/@azure/arm-apimanagement/lib/operations/apiExport.ts
index ac9bf9ca32c7..a55935ff40e9 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiExport.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiExport.ts
@@ -60,7 +60,7 @@ export class ApiExport {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiExportResult>, callback?: msRest.ServiceCallback<Models.ApiExportResult>): Promise<Models.ApiExportGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiIssue.ts b/packages/@azure/arm-apimanagement/lib/operations/apiIssue.ts
index 1310e61b8000..00fd75cccc25 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiIssue.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiIssue.ts
@@ -50,7 +50,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiIssueListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiIssueListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -89,7 +89,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -129,7 +129,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -172,7 +172,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options: Models.ApiIssueCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, parameters: Models.IssueContract, options?: Models.ApiIssueCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueContract>, callback?: msRest.ServiceCallback<Models.IssueContract>): Promise<Models.ApiIssueCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,7 +219,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -251,7 +251,7 @@ export class ApiIssue {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCollection>, callback?: msRest.ServiceCallback<Models.IssueCollection>): Promise<Models.ApiIssueListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiIssueAttachment.ts b/packages/@azure/arm-apimanagement/lib/operations/apiIssueAttachment.ts
index 8c248a94678b..12fa6dfa74a2 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiIssueAttachment.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiIssueAttachment.ts
@@ -53,7 +53,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueAttachmentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueAttachmentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -97,7 +97,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueAttachmentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -141,7 +141,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,7 +188,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueAttachmentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, parameters: Models.IssueAttachmentContract, options?: Models.ApiIssueAttachmentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueAttachmentContract>, callback?: msRest.ServiceCallback<Models.IssueAttachmentContract>): Promise<Models.ApiIssueAttachmentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,7 +239,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, attachmentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -272,7 +272,7 @@ export class ApiIssueAttachment {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueAttachmentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueAttachmentCollection>, callback?: msRest.ServiceCallback<Models.IssueAttachmentCollection>): Promise<Models.ApiIssueAttachmentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiIssueComment.ts b/packages/@azure/arm-apimanagement/lib/operations/apiIssueComment.ts
index 26088ae15911..d29512202246 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiIssueComment.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiIssueComment.ts
@@ -53,7 +53,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options: Models.ApiIssueCommentListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, options?: Models.ApiIssueCommentListByServiceOptionalParams | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -97,7 +97,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiIssueCommentGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -141,7 +141,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -188,7 +188,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IssueCommentContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, parameters: Models.IssueCommentContract, options?: Models.ApiIssueCommentCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IssueCommentContract>, callback?: msRest.ServiceCallback<Models.IssueCommentContract>): Promise<Models.ApiIssueCommentCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -239,7 +239,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, issueId: string, commentId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -272,7 +272,7 @@ export class ApiIssueComment {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IssueCommentCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IssueCommentCollection>, callback?: msRest.ServiceCallback<Models.IssueCommentCollection>): Promise<Models.ApiIssueCommentListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiManagementOperations.ts b/packages/@azure/arm-apimanagement/lib/operations/apiManagementOperations.ts
index 4bac096a5fe6..f407ac27dc64 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiManagementOperations.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiManagementOperations.ts
@@ -41,7 +41,7 @@ export class ApiManagementOperations {
    * @param callback The callback
    */
   list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
+  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -68,7 +68,7 @@ export class ApiManagementOperations {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationListResult>, callback?: msRest.ServiceCallback<Models.OperationListResult>): Promise<Models.ApiManagementOperationsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiManagementService.ts b/packages/@azure/arm-apimanagement/lib/operations/apiManagementService.ts
index 9847193504a5..042db6a129bc 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiManagementService.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiManagementService.ts
@@ -105,7 +105,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceResource>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceResource>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceResource>): Promise<Models.ApiManagementServiceGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -137,7 +137,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   listByResourceGroup(resourceGroupName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
+  listByResourceGroup(resourceGroupName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -191,7 +191,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  list(options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
+  list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -221,7 +221,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   getSsoToken(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): void;
-  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
+  getSsoToken(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceGetSsoTokenResult>): Promise<Models.ApiManagementServiceGetSsoTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -250,7 +250,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): void;
-  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
+  checkNameAvailability(parameters: Models.ApiManagementServiceCheckNameAvailabilityParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceNameAvailabilityResult>): Promise<Models.ApiManagementServiceCheckNameAvailabilityResponse> {
     return this.client.sendOperationRequest(
       {
         parameters,
@@ -301,7 +301,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   uploadCertificate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUploadCertificateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateInformation>): void;
-  uploadCertificate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUploadCertificateParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.CertificateInformation>): Promise<Models.ApiManagementServiceUploadCertificateResponse> {
+  uploadCertificate(resourceGroupName: string, serviceName: string, parameters: Models.ApiManagementServiceUploadCertificateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateInformation>, callback?: msRest.ServiceCallback<Models.CertificateInformation>): Promise<Models.ApiManagementServiceUploadCertificateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -474,7 +474,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
+  listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListByResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -502,7 +502,7 @@ export class ApiManagementService {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiManagementServiceListResult>, callback?: msRest.ServiceCallback<Models.ApiManagementServiceListResult>): Promise<Models.ApiManagementServiceListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiOperation.ts b/packages/@azure/arm-apimanagement/lib/operations/apiOperation.ts
index f1608474e6be..1b99899ff32b 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiOperation.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiOperation.ts
@@ -53,7 +53,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiOperationListByApiOptionalParams, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiOperationListByApiOptionalParams | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,7 +98,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -144,7 +144,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -193,7 +193,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options: Models.ApiOperationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OperationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationContract, options?: Models.ApiOperationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OperationContract>, callback?: msRest.ServiceCallback<Models.OperationContract>): Promise<Models.ApiOperationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -249,7 +249,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.OperationUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -303,7 +303,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -335,7 +335,7 @@ export class ApiOperation {
    * @param callback The callback
    */
   listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OperationCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OperationCollection>, callback?: msRest.ServiceCallback<Models.OperationCollection>): Promise<Models.ApiOperationListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiOperationPolicy.ts b/packages/@azure/arm-apimanagement/lib/operations/apiOperationPolicy.ts
index 9d74f5122b84..758a68af8a11 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiOperationPolicy.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiOperationPolicy.ts
@@ -59,7 +59,7 @@ export class ApiOperationPolicy {
    * @param callback The callback
    */
   listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiOperationPolicyListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -105,7 +105,7 @@ export class ApiOperationPolicy {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiOperationPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -151,7 +151,7 @@ export class ApiOperationPolicy {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,7 +200,7 @@ export class ApiOperationPolicy {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, parameters: Models.PolicyContract, options?: Models.ApiOperationPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiOperationPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -253,7 +253,7 @@ export class ApiOperationPolicy {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiPolicy.ts b/packages/@azure/arm-apimanagement/lib/operations/apiPolicy.ts
index f44825083c0a..c0132b65ab9d 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiPolicy.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiPolicy.ts
@@ -53,7 +53,7 @@ export class ApiPolicy {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ApiPolicyListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -92,7 +92,7 @@ export class ApiPolicy {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,7 +131,7 @@ export class ApiPolicy {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ApiPolicy {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options: Models.ApiPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, parameters: Models.PolicyContract, options?: Models.ApiPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ApiPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,7 +219,7 @@ export class ApiPolicy {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiProduct.ts b/packages/@azure/arm-apimanagement/lib/operations/apiProduct.ts
index 193dcc69cc14..3f7c3d234b19 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiProduct.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiProduct.ts
@@ -50,7 +50,7 @@ export class ApiProduct {
    * @param callback The callback
    */
   listByApis(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiProductListByApisOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
+  listByApis(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiProductListByApisOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class ApiProduct {
    * @param callback The callback
    */
   listByApisNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
+  listByApisNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ApiProductListByApisNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiRelease.ts b/packages/@azure/arm-apimanagement/lib/operations/apiRelease.ts
index 1a7247c7ebb2..a132a2b1b792 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiRelease.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiRelease.ts
@@ -52,7 +52,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiReleaseListOptionalParams, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  list(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListOptionalParams, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListResponse> {
+  list(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiReleaseListOptionalParams | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -94,7 +94,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiReleaseGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -137,7 +137,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -183,7 +183,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   create(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseContract>): void;
-  create(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseContract>, callback?: msRest.ServiceCallback<Models.ApiReleaseContract>): Promise<Models.ApiReleaseCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -236,7 +236,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, parameters: Models.ApiReleaseContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -287,7 +287,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, releaseId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -321,7 +321,7 @@ export class ApiRelease {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiReleaseCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiReleaseCollection>, callback?: msRest.ServiceCallback<Models.ApiReleaseCollection>): Promise<Models.ApiReleaseListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiRevisions.ts b/packages/@azure/arm-apimanagement/lib/operations/apiRevisions.ts
index 098ad1d5b687..b774aa2650f2 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiRevisions.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiRevisions.ts
@@ -50,7 +50,7 @@ export class ApiRevisions {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, apiId: string, options: Models.ApiRevisionsListOptionalParams, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionsListOptionalParams, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.ApiRevisionsListOptionalParams | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class ApiRevisions {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiRevisionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionsListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiRevisionCollection>, callback?: msRest.ServiceCallback<Models.ApiRevisionCollection>): Promise<Models.ApiRevisionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiSchema.ts b/packages/@azure/arm-apimanagement/lib/operations/apiSchema.ts
index 3c97c232944a..c1ac7468c13f 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiSchema.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiSchema.ts
@@ -53,7 +53,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,7 +98,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiSchemaGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -144,7 +144,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -193,7 +193,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaContract, options: Models.ApiSchemaCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SchemaContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, parameters: Models.SchemaContract, options?: Models.ApiSchemaCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SchemaContract>, callback?: msRest.ServiceCallback<Models.SchemaContract>): Promise<Models.ApiSchemaCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -246,7 +246,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, schemaId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class ApiSchema {
    * @param callback The callback
    */
   listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SchemaCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
+  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SchemaCollection>, callback?: msRest.ServiceCallback<Models.SchemaCollection>): Promise<Models.ApiSchemaListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/apiVersionSet.ts b/packages/@azure/arm-apimanagement/lib/operations/apiVersionSet.ts
index d5af98ccc3e1..1855a619e07b 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/apiVersionSet.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/apiVersionSet.ts
@@ -47,7 +47,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.ApiVersionSetListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ApiVersionSetListByServiceOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ApiVersionSetGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, versionSetId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
+  get(resourceGroupName: string, serviceName: string, versionSetId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ApiVersionSetContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetContract, options?: Models.ApiVersionSetCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ApiVersionSetContract>, callback?: msRest.ServiceCallback<Models.ApiVersionSetContract>): Promise<Models.ApiVersionSetCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -215,7 +215,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, versionSetId: string, parameters: Models.ApiVersionSetUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -262,7 +262,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, versionSetId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -293,7 +293,7 @@ export class ApiVersionSet {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiVersionSetCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiVersionSetCollection>, callback?: msRest.ServiceCallback<Models.ApiVersionSetCollection>): Promise<Models.ApiVersionSetListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/authorizationServer.ts b/packages/@azure/arm-apimanagement/lib/operations/authorizationServer.ts
index e717df2b5597..34b5c4895f46 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/authorizationServer.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/authorizationServer.ts
@@ -47,7 +47,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.AuthorizationServerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.AuthorizationServerListByServiceOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.AuthorizationServerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, authsid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, authsid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.AuthorizationServerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerContract, options?: Models.AuthorizationServerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.AuthorizationServerContract>, callback?: msRest.ServiceCallback<Models.AuthorizationServerContract>): Promise<Models.AuthorizationServerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, authsid: string, parameters: Models.AuthorizationServerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, authsid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class AuthorizationServer {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AuthorizationServerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AuthorizationServerCollection>, callback?: msRest.ServiceCallback<Models.AuthorizationServerCollection>): Promise<Models.AuthorizationServerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/backend.ts b/packages/@azure/arm-apimanagement/lib/operations/backend.ts
index d8bdd30326d9..23d7bef9ed44 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/backend.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/backend.ts
@@ -47,7 +47,7 @@ export class Backend {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.BackendListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.BackendListByServiceOptionalParams | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class Backend {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, backendid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, backendid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, backendid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.BackendGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Backend {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, backendid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  get(resourceGroupName: string, serviceName: string, backendid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
+  get(resourceGroupName: string, serviceName: string, backendid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Backend {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendContract, options: Models.BackendCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.BackendContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendContract, options?: Models.BackendCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.BackendContract>, callback?: msRest.ServiceCallback<Models.BackendContract>): Promise<Models.BackendCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -215,7 +215,7 @@ export class Backend {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, backendid: string, parameters: Models.BackendUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -262,7 +262,7 @@ export class Backend {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, backendid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, backendid: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, backendid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -303,7 +303,7 @@ export class Backend {
    * @param callback The callback
    */
   reconnect(resourceGroupName: string, serviceName: string, backendid: string, options: Models.BackendReconnectOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  reconnect(resourceGroupName: string, serviceName: string, backendid: string, options?: Models.BackendReconnectOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  reconnect(resourceGroupName: string, serviceName: string, backendid: string, options?: Models.BackendReconnectOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -333,7 +333,7 @@ export class Backend {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.BackendCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.BackendCollection>, callback?: msRest.ServiceCallback<Models.BackendCollection>): Promise<Models.BackendListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/certificate.ts b/packages/@azure/arm-apimanagement/lib/operations/certificate.ts
index aa5d960697b8..3dbb992530fe 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/certificate.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/certificate.ts
@@ -47,7 +47,7 @@ export class Certificate {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.CertificateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.CertificateListByServiceOptionalParams | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class Certificate {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.CertificateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Certificate {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, certificateId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, certificateId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Certificate {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options: Models.CertificateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.CertificateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, certificateId: string, parameters: Models.CertificateCreateOrUpdateParameters, options?: Models.CertificateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.CertificateContract>, callback?: msRest.ServiceCallback<Models.CertificateContract>): Promise<Models.CertificateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -212,7 +212,7 @@ export class Certificate {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, certificateId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -243,7 +243,7 @@ export class Certificate {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.CertificateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.CertificateCollection>, callback?: msRest.ServiceCallback<Models.CertificateCollection>): Promise<Models.CertificateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/delegationSettings.ts b/packages/@azure/arm-apimanagement/lib/operations/delegationSettings.ts
index 105812a83efd..f015580bf836 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/delegationSettings.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/delegationSettings.ts
@@ -47,7 +47,7 @@ export class DelegationSettings {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DelegationSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -79,7 +79,7 @@ export class DelegationSettings {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -120,7 +120,7 @@ export class DelegationSettings {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class DelegationSettings {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalDelegationSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalDelegationSettings, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalDelegationSettings>, callback?: msRest.ServiceCallback<Models.PortalDelegationSettings>): Promise<Models.DelegationSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/diagnostic.ts b/packages/@azure/arm-apimanagement/lib/operations/diagnostic.ts
index 5e4c390d84f0..965395fb8ea6 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/diagnostic.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/diagnostic.ts
@@ -47,7 +47,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.DiagnosticListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.DiagnosticListByServiceOptionalParams | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.DiagnosticGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, diagnosticId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
+  get(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options: Models.DiagnosticCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.DiagnosticContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, options?: Models.DiagnosticCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.DiagnosticContract>, callback?: msRest.ServiceCallback<Models.DiagnosticContract>): Promise<Models.DiagnosticCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -215,7 +215,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, diagnosticId: string, parameters: Models.DiagnosticContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -262,7 +262,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -293,7 +293,7 @@ export class Diagnostic {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.DiagnosticCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.DiagnosticCollection>, callback?: msRest.ServiceCallback<Models.DiagnosticCollection>): Promise<Models.DiagnosticListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/diagnosticLogger.ts b/packages/@azure/arm-apimanagement/lib/operations/diagnosticLogger.ts
index d7f33332cc3f..2eb5de1cdbbe 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/diagnosticLogger.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/diagnosticLogger.ts
@@ -54,7 +54,7 @@ export class DiagnosticLogger {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, diagnosticId: string, options: Models.DiagnosticLoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: Models.DiagnosticLoggerListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.DiagnosticLoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, diagnosticId: string, options?: Models.DiagnosticLoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.DiagnosticLoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -96,7 +96,7 @@ export class DiagnosticLogger {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.DiagnosticLoggerCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.DiagnosticLoggerCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class DiagnosticLogger {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.DiagnosticLoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.DiagnosticLoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -182,7 +182,7 @@ export class DiagnosticLogger {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, diagnosticId: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -214,7 +214,7 @@ export class DiagnosticLogger {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.DiagnosticLoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.DiagnosticLoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/emailTemplate.ts b/packages/@azure/arm-apimanagement/lib/operations/emailTemplate.ts
index f687381edd66..3f4d068e7524 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/emailTemplate.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/emailTemplate.ts
@@ -47,7 +47,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.EmailTemplateListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.EmailTemplateListByServiceOptionalParams | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -103,7 +103,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.EmailTemplateGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -160,7 +160,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
+  get(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -220,7 +220,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: Models.EmailTemplateCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.EmailTemplateContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: Models.EmailTemplateCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.EmailTemplateContract>, callback?: msRest.ServiceCallback<Models.EmailTemplateContract>): Promise<Models.EmailTemplateCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -281,7 +281,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, parameters: Models.EmailTemplateUpdateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -345,7 +345,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, templateName: Models.TemplateName, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -376,7 +376,7 @@ export class EmailTemplate {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.EmailTemplateCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.EmailTemplateCollection>, callback?: msRest.ServiceCallback<Models.EmailTemplateCollection>): Promise<Models.EmailTemplateListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/group.ts b/packages/@azure/arm-apimanagement/lib/operations/group.ts
index 617797db5936..93dfd4b2a377 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/group.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/group.ts
@@ -47,7 +47,7 @@ export class Group {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.GroupListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.GroupListByServiceOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class Group {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.GroupGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class Group {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
+  get(resourceGroupName: string, serviceName: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class Group {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options: Models.GroupCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupCreateParameters, options?: Models.GroupCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.GroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class Group {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, groupId: string, parameters: Models.GroupUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class Group {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class Group {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.GroupListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/groupUser.ts b/packages/@azure/arm-apimanagement/lib/operations/groupUser.ts
index b8b5c1590450..edc155a01c90 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/groupUser.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/groupUser.ts
@@ -50,7 +50,7 @@ export class GroupUser {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, groupId: string, options: Models.GroupUserListOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
+  list(resourceGroupName: string, serviceName: string, groupId: string, options?: Models.GroupUserListOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -89,7 +89,7 @@ export class GroupUser {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.GroupUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -129,7 +129,7 @@ export class GroupUser {
    * @param callback The callback
    */
   create(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  create(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
+  create(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.GroupUserCreateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -169,7 +169,7 @@ export class GroupUser {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, groupId: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -200,7 +200,7 @@ export class GroupUser {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.GroupUserListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/identityProvider.ts b/packages/@azure/arm-apimanagement/lib/operations/identityProvider.ts
index ac3076249a61..2d24afbf5161 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/identityProvider.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/identityProvider.ts
@@ -47,7 +47,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.IdentityProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -125,7 +125,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -167,7 +167,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options: Models.IdentityProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.IdentityProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderContract, options?: Models.IdentityProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.IdentityProviderContract>, callback?: msRest.ServiceCallback<Models.IdentityProviderContract>): Promise<Models.IdentityProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -216,7 +216,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, parameters: Models.IdentityProviderUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -263,7 +263,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, identityProviderName: Models.IdentityProviderType, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -294,7 +294,7 @@ export class IdentityProvider {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.IdentityProviderList>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.IdentityProviderList>, callback?: msRest.ServiceCallback<Models.IdentityProviderList>): Promise<Models.IdentityProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/logger.ts b/packages/@azure/arm-apimanagement/lib/operations/logger.ts
index 2b32972fcc1b..2d8a0eb806d4 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/logger.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/logger.ts
@@ -47,7 +47,7 @@ export class Logger {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.LoggerListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.LoggerListByServiceOptionalParams | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class Logger {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.LoggerGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class Logger {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, loggerid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  get(resourceGroupName: string, serviceName: string, loggerid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
+  get(resourceGroupName: string, serviceName: string, loggerid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class Logger {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerContract, options: Models.LoggerCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.LoggerContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerContract, options?: Models.LoggerCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.LoggerContract>, callback?: msRest.ServiceCallback<Models.LoggerContract>): Promise<Models.LoggerCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class Logger {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, loggerid: string, parameters: Models.LoggerUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class Logger {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, loggerid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, loggerid: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, loggerid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class Logger {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.LoggerCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.LoggerCollection>, callback?: msRest.ServiceCallback<Models.LoggerCollection>): Promise<Models.LoggerListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/networkStatus.ts b/packages/@azure/arm-apimanagement/lib/operations/networkStatus.ts
index 477d893a909b..5366d065d23d 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/networkStatus.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/networkStatus.ts
@@ -49,7 +49,7 @@ export class NetworkStatus {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>, callback?: msRest.ServiceCallback<Models.NetworkStatusContractByLocation[]>): Promise<Models.NetworkStatusListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -89,7 +89,7 @@ export class NetworkStatus {
    * @param callback The callback
    */
   listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NetworkStatusContract>): void;
-  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
+  listByLocation(resourceGroupName: string, serviceName: string, locationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NetworkStatusContract>, callback?: msRest.ServiceCallback<Models.NetworkStatusContract>): Promise<Models.NetworkStatusListByLocationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/notification.ts b/packages/@azure/arm-apimanagement/lib/operations/notification.ts
index 505a5fd5075c..bc2af47da265 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/notification.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/notification.ts
@@ -47,7 +47,7 @@ export class Notification {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.NotificationListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.NotificationListByServiceOptionalParams | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -91,7 +91,7 @@ export class Notification {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
+  get(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -136,7 +136,7 @@ export class Notification {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: Models.NotificationCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.NotificationContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: Models.NotificationCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.NotificationContract>, callback?: msRest.ServiceCallback<Models.NotificationContract>): Promise<Models.NotificationCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Notification {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.NotificationCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.NotificationCollection>, callback?: msRest.ServiceCallback<Models.NotificationCollection>): Promise<Models.NotificationListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientEmail.ts b/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
index e12a920aa8c1..fc9246f19464 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
@@ -59,7 +59,7 @@ export class NotificationRecipientEmail {
    * @param callback The callback
    */
   listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailCollection>, callback?: msRest.ServiceCallback<Models.RecipientEmailCollection>): Promise<Models.NotificationRecipientEmailListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class NotificationRecipientEmail {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class NotificationRecipientEmail {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientEmailContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientEmailContract>, callback?: msRest.ServiceCallback<Models.RecipientEmailContract>): Promise<Models.NotificationRecipientEmailCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -205,7 +205,7 @@ export class NotificationRecipientEmail {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientUser.ts b/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientUser.ts
index b1d204ac2d8b..7049a8a5f4c3 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientUser.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/notificationRecipientUser.ts
@@ -59,7 +59,7 @@ export class NotificationRecipientUser {
    * @param callback The callback
    */
   listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserCollection>): void;
-  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
+  listByNotification(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserCollection>, callback?: msRest.ServiceCallback<Models.RecipientUserCollection>): Promise<Models.NotificationRecipientUserListByNotificationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -107,7 +107,7 @@ export class NotificationRecipientUser {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -156,7 +156,7 @@ export class NotificationRecipientUser {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RecipientUserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RecipientUserContract>, callback?: msRest.ServiceCallback<Models.RecipientUserContract>): Promise<Models.NotificationRecipientUserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -205,7 +205,7 @@ export class NotificationRecipientUser {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/openIdConnectProvider.ts b/packages/@azure/arm-apimanagement/lib/operations/openIdConnectProvider.ts
index 4e71ff28defb..e71c2742afd7 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/openIdConnectProvider.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/openIdConnectProvider.ts
@@ -47,7 +47,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.OpenIdConnectProviderListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.OpenIdConnectProviderListByServiceOptionalParams | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.OpenIdConnectProviderGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, opid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
+  get(resourceGroupName: string, serviceName: string, opid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderContract, options?: Models.OpenIdConnectProviderCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.OpenidConnectProviderContract>, callback?: msRest.ServiceCallback<Models.OpenidConnectProviderContract>): Promise<Models.OpenIdConnectProviderCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, opid: string, parameters: Models.OpenidConnectProviderUpdateContract, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, opid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class OpenIdConnectProvider {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>, callback?: msRest.ServiceCallback<Models.OpenIdConnectProviderCollection>): Promise<Models.OpenIdConnectProviderListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/operationOperations.ts b/packages/@azure/arm-apimanagement/lib/operations/operationOperations.ts
index 1802d84a1a4e..1c036d4f032a 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/operationOperations.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/operationOperations.ts
@@ -53,7 +53,7 @@ export class OperationOperations {
    * @param callback The callback
    */
   listByTags(resourceGroupName: string, serviceName: string, apiId: string, options: Models.OperationListByTagsOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
+  listByTags(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.OperationListByTagsOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class OperationOperations {
    * @param callback The callback
    */
   listByTagsNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
+  listByTagsNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.OperationListByTagsNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/policy.ts b/packages/@azure/arm-apimanagement/lib/operations/policy.ts
index 03b936dcf10f..5947f78f0b60 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/policy.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/policy.ts
@@ -47,7 +47,7 @@ export class Policy {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.PolicyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicyListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicyListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.PolicyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class Policy {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -112,7 +112,7 @@ export class Policy {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -147,7 +147,7 @@ export class Policy {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PolicyContract, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.PolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -186,7 +186,7 @@ export class Policy {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/policySnippets.ts b/packages/@azure/arm-apimanagement/lib/operations/policySnippets.ts
index d09b3804bd9c..c4bece5177a0 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/policySnippets.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/policySnippets.ts
@@ -47,7 +47,7 @@ export class PolicySnippets {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.PolicySnippetsListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PolicySnippetsCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetsListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetsListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PolicySnippetsListByServiceOptionalParams | msRest.ServiceCallback<Models.PolicySnippetsCollection>, callback?: msRest.ServiceCallback<Models.PolicySnippetsCollection>): Promise<Models.PolicySnippetsListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/product.ts b/packages/@azure/arm-apimanagement/lib/operations/product.ts
index 50865e32349a..44d58401c169 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/product.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/product.ts
@@ -47,7 +47,7 @@ export class Product {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.ProductListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.ProductListByServiceOptionalParams | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -85,7 +85,7 @@ export class Product {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -124,7 +124,7 @@ export class Product {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -166,7 +166,7 @@ export class Product {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options: Models.ProductCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.ProductContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductContract, options?: Models.ProductCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.ProductContract>, callback?: msRest.ServiceCallback<Models.ProductContract>): Promise<Models.ProductCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -215,7 +215,7 @@ export class Product {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.ProductUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -262,7 +262,7 @@ export class Product {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: Models.ProductDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: Models.ProductDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -293,7 +293,7 @@ export class Product {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductCollection>, callback?: msRest.ServiceCallback<Models.ProductCollection>): Promise<Models.ProductListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/productApi.ts b/packages/@azure/arm-apimanagement/lib/operations/productApi.ts
index 40fe1b289405..ae0a207aeb22 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/productApi.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/productApi.ts
@@ -53,7 +53,7 @@ export class ProductApi {
    * @param callback The callback
    */
   listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductApiListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductApiListByProductOptionalParams | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -98,7 +98,7 @@ export class ProductApi {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ProductApiCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ProductApiCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -144,7 +144,7 @@ export class ProductApi {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiContract>, callback?: msRest.ServiceCallback<Models.ApiContract>): Promise<Models.ProductApiCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -190,7 +190,7 @@ export class ProductApi {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, apiId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -221,7 +221,7 @@ export class ProductApi {
    * @param callback The callback
    */
   listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApiCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApiCollection>, callback?: msRest.ServiceCallback<Models.ApiCollection>): Promise<Models.ProductApiListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/productGroup.ts b/packages/@azure/arm-apimanagement/lib/operations/productGroup.ts
index a5e6374f3ab0..75fcfd0943b3 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/productGroup.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/productGroup.ts
@@ -53,7 +53,7 @@ export class ProductGroup {
    * @param callback The callback
    */
   listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductGroupListByProductOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductGroupListByProductOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -95,7 +95,7 @@ export class ProductGroup {
    * @param callback The callback
    */
   checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ProductGroupCheckEntityExistsResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.ProductGroupCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -138,7 +138,7 @@ export class ProductGroup {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupContract>, callback?: msRest.ServiceCallback<Models.GroupContract>): Promise<Models.ProductGroupCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -181,7 +181,7 @@ export class ProductGroup {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, groupId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -212,7 +212,7 @@ export class ProductGroup {
    * @param callback The callback
    */
   listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.ProductGroupListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/productPolicy.ts b/packages/@azure/arm-apimanagement/lib/operations/productPolicy.ts
index 5362e4288ec0..cbc5e3e35f5a 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/productPolicy.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/productPolicy.ts
@@ -53,7 +53,7 @@ export class ProductPolicy {
    * @param callback The callback
    */
   listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyCollection>, callback?: msRest.ServiceCallback<Models.PolicyCollection>): Promise<Models.ProductPolicyListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -92,7 +92,7 @@ export class ProductPolicy {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.ProductPolicyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -131,7 +131,7 @@ export class ProductPolicy {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, productId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, productId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -173,7 +173,7 @@ export class ProductPolicy {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options: Models.ProductPolicyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PolicyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, productId: string, parameters: Models.PolicyContract, options?: Models.ProductPolicyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PolicyContract>, callback?: msRest.ServiceCallback<Models.PolicyContract>): Promise<Models.ProductPolicyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -219,7 +219,7 @@ export class ProductPolicy {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, productId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/productSubscriptions.ts b/packages/@azure/arm-apimanagement/lib/operations/productSubscriptions.ts
index 1df0b16710ef..9a0f73e52e2b 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/productSubscriptions.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/productSubscriptions.ts
@@ -53,7 +53,7 @@ export class ProductSubscriptions {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, productId: string, options: Models.ProductSubscriptionsListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
+  list(resourceGroupName: string, serviceName: string, productId: string, options?: Models.ProductSubscriptionsListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -83,7 +83,7 @@ export class ProductSubscriptions {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.ProductSubscriptionsListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/property.ts b/packages/@azure/arm-apimanagement/lib/operations/property.ts
index 619e503ce07b..80422823748f 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/property.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/property.ts
@@ -47,7 +47,7 @@ export class Property {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.PropertyListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.PropertyListByServiceOptionalParams | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class Property {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.PropertyGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class Property {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, propId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
+  get(resourceGroupName: string, serviceName: string, propId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class Property {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options: Models.PropertyCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.PropertyContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyContract, options?: Models.PropertyCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.PropertyContract>, callback?: msRest.ServiceCallback<Models.PropertyContract>): Promise<Models.PropertyCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class Property {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, propId: string, parameters: Models.PropertyUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class Property {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, propId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -278,7 +278,7 @@ export class Property {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PropertyCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PropertyCollection>, callback?: msRest.ServiceCallback<Models.PropertyCollection>): Promise<Models.PropertyListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/quotaByCounterKeys.ts b/packages/@azure/arm-apimanagement/lib/operations/quotaByCounterKeys.ts
index f5d9ed27b18c..3c2fb56d553e 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/quotaByCounterKeys.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/quotaByCounterKeys.ts
@@ -60,7 +60,7 @@ export class QuotaByCounterKeys {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, quotaCounterKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterCollection>, callback?: msRest.ServiceCallback<Models.QuotaCounterCollection>): Promise<Models.QuotaByCounterKeysListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -109,7 +109,7 @@ export class QuotaByCounterKeys {
    * @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, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, quotaCounterKey: string, parameters: Models.QuotaCounterValueContractProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/quotaByPeriodKeys.ts b/packages/@azure/arm-apimanagement/lib/operations/quotaByPeriodKeys.ts
index 2be2c03c3f2f..fd289c49e706 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/quotaByPeriodKeys.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/quotaByPeriodKeys.ts
@@ -63,7 +63,7 @@ export class QuotaByPeriodKeys {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.QuotaCounterContract>): void;
-  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
+  get(resourceGroupName: string, serviceName: string, quotaCounterKey: string, quotaPeriodKey: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.QuotaCounterContract>, callback?: msRest.ServiceCallback<Models.QuotaCounterContract>): Promise<Models.QuotaByPeriodKeysGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -115,7 +115,7 @@ export class QuotaByPeriodKeys {
    * @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, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  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> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/regions.ts b/packages/@azure/arm-apimanagement/lib/operations/regions.ts
index e46a30d40a8a..f8e08de599d3 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/regions.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/regions.ts
@@ -47,7 +47,7 @@ export class Regions {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionsListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionsListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class Regions {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RegionListResult>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionsListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RegionListResult>, callback?: msRest.ServiceCallback<Models.RegionListResult>): Promise<Models.RegionsListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/reports.ts b/packages/@azure/arm-apimanagement/lib/operations/reports.ts
index 3368297c8fe6..c35cae7367f5 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/reports.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/reports.ts
@@ -50,7 +50,7 @@ export class Reports {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByApiOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByApiOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -86,7 +86,7 @@ export class Reports {
    * @param callback The callback
    */
   listByUser(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByUserOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
+  listByUser(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByUserOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class Reports {
    * @param callback The callback
    */
   listByOperation(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByOperationOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -158,7 +158,7 @@ export class Reports {
    * @param callback The callback
    */
   listByProduct(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByProductOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByProductOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -191,7 +191,7 @@ export class Reports {
    * @param callback The callback
    */
   listByGeo(resourceGroupName: string, serviceName: string, options: Models.ReportsListByGeoOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeo(resourceGroupName: string, serviceName: string, options?: Models.ReportsListByGeoOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
+  listByGeo(resourceGroupName: string, serviceName: string, options?: Models.ReportsListByGeoOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -223,7 +223,7 @@ export class Reports {
    * @param callback The callback
    */
   listBySubscription(resourceGroupName: string, serviceName: string, options: Models.ReportsListBySubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscription(resourceGroupName: string, serviceName: string, options?: Models.ReportsListBySubscriptionOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
+  listBySubscription(resourceGroupName: string, serviceName: string, options?: Models.ReportsListBySubscriptionOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -267,7 +267,7 @@ export class Reports {
    * @param callback The callback
    */
   listByTime(resourceGroupName: string, serviceName: string, interval: string, options: Models.ReportsListByTimeOptionalParams, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTime(resourceGroupName: string, serviceName: string, interval: string, options?: Models.ReportsListByTimeOptionalParams, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
+  listByTime(resourceGroupName: string, serviceName: string, interval: string, options?: Models.ReportsListByTimeOptionalParams | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -303,7 +303,7 @@ export class Reports {
    * @param callback The callback
    */
   listByRequest(resourceGroupName: string, serviceName: string, filter: string, options: Models.ReportsListByRequestOptionalParams, callback: msRest.ServiceCallback<Models.RequestReportCollection>): void;
-  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
+  listByRequest(resourceGroupName: string, serviceName: string, filter: string, options?: Models.ReportsListByRequestOptionalParams | msRest.ServiceCallback<Models.RequestReportCollection>, callback?: msRest.ServiceCallback<Models.RequestReportCollection>): Promise<Models.ReportsListByRequestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -333,7 +333,7 @@ export class Reports {
    * @param callback The callback
    */
   listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -361,7 +361,7 @@ export class Reports {
    * @param callback The callback
    */
   listByUserNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
+  listByUserNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByUserNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -389,7 +389,7 @@ export class Reports {
    * @param callback The callback
    */
   listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -417,7 +417,7 @@ export class Reports {
    * @param callback The callback
    */
   listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -445,7 +445,7 @@ export class Reports {
    * @param callback The callback
    */
   listByGeoNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
+  listByGeoNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByGeoNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -473,7 +473,7 @@ export class Reports {
    * @param callback The callback
    */
   listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
+  listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListBySubscriptionNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -501,7 +501,7 @@ export class Reports {
    * @param callback The callback
    */
   listByTimeNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ReportCollection>): void;
-  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
+  listByTimeNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ReportCollection>, callback?: msRest.ServiceCallback<Models.ReportCollection>): Promise<Models.ReportsListByTimeNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/signInSettings.ts b/packages/@azure/arm-apimanagement/lib/operations/signInSettings.ts
index 3ad67b8d9833..04dbd72f8a9f 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/signInSettings.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/signInSettings.ts
@@ -47,7 +47,7 @@ export class SignInSettings {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignInSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -79,7 +79,7 @@ export class SignInSettings {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -120,7 +120,7 @@ export class SignInSettings {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class SignInSettings {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSigninSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSigninSettings, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSigninSettings>, callback?: msRest.ServiceCallback<Models.PortalSigninSettings>): Promise<Models.SignInSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/signUpSettings.ts b/packages/@azure/arm-apimanagement/lib/operations/signUpSettings.ts
index f8e1cc475afd..37f3b1f95fae 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/signUpSettings.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/signUpSettings.ts
@@ -47,7 +47,7 @@ export class SignUpSettings {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SignUpSettingsGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -79,7 +79,7 @@ export class SignUpSettings {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -120,7 +120,7 @@ export class SignUpSettings {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class SignUpSettings {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PortalSignupSettings>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, parameters: Models.PortalSignupSettings, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PortalSignupSettings>, callback?: msRest.ServiceCallback<Models.PortalSignupSettings>): Promise<Models.SignUpSettingsCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/subscription.ts b/packages/@azure/arm-apimanagement/lib/operations/subscription.ts
index f5b9537ef816..668b35d07829 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/subscription.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/subscription.ts
@@ -47,7 +47,7 @@ export class Subscription {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, options: Models.SubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, options?: Models.SubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -86,7 +86,7 @@ export class Subscription {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.SubscriptionGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -125,7 +125,7 @@ export class Subscription {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -167,7 +167,7 @@ export class Subscription {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options: Models.SubscriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionCreateParameters, options?: Models.SubscriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.SubscriptionContract>, callback?: msRest.ServiceCallback<Models.SubscriptionContract>): Promise<Models.SubscriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -216,7 +216,7 @@ export class Subscription {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options: Models.SubscriptionUpdateOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, sid: string, parameters: Models.SubscriptionUpdateParameters, ifMatch: string, options?: Models.SubscriptionUpdateOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -263,7 +263,7 @@ export class Subscription {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, sid: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -303,7 +303,7 @@ export class Subscription {
    * @param callback The callback
    */
   regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -342,7 +342,7 @@ export class Subscription {
    * @param callback The callback
    */
   regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, sid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -372,7 +372,7 @@ export class Subscription {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.SubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tag.ts b/packages/@azure/arm-apimanagement/lib/operations/tag.ts
index 7677e5ea093b..8568b3152d4a 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tag.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tag.ts
@@ -47,7 +47,7 @@ export class Tag {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.TagListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagListByServiceOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class Tag {
    * @param callback The callback
    */
   getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class Tag {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
+  get(resourceGroupName: string, serviceName: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class Tag {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class Tag {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, tagId: string, parameters: Models.TagCreateUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class Tag {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -287,7 +287,7 @@ export class Tag {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagListByApiOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -329,7 +329,7 @@ export class Tag {
    * @param callback The callback
    */
   getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
+  getEntityStateByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -372,7 +372,7 @@ export class Tag {
    * @param callback The callback
    */
   getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
+  getByApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -415,7 +415,7 @@ export class Tag {
    * @param callback The callback
    */
   assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: Models.TagAssignToApiOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: Models.TagAssignToApiOptionalParams, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
+  assignToApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: Models.TagAssignToApiOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -464,7 +464,7 @@ export class Tag {
    * @param callback The callback
    */
   detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromApi(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -511,7 +511,7 @@ export class Tag {
    * @param callback The callback
    */
   listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options: Models.TagListByOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
+  listByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, options?: Models.TagListByOperationOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -560,7 +560,7 @@ export class Tag {
    * @param callback The callback
    */
   getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
+  getEntityStateByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -610,7 +610,7 @@ export class Tag {
    * @param callback The callback
    */
   getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
+  getByOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -660,7 +660,7 @@ export class Tag {
    * @param callback The callback
    */
   assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options: Models.TagAssignToOperationOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: Models.TagAssignToOperationOptionalParams, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
+  assignToOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, options?: Models.TagAssignToOperationOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToOperationResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -716,7 +716,7 @@ export class Tag {
    * @param callback The callback
    */
   detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromOperation(resourceGroupName: string, serviceName: string, apiId: string, operationId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -758,7 +758,7 @@ export class Tag {
    * @param callback The callback
    */
   listByProduct(resourceGroupName: string, serviceName: string, productId: string, options: Models.TagListByProductOptionalParams, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
+  listByProduct(resourceGroupName: string, serviceName: string, productId: string, options?: Models.TagListByProductOptionalParams | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -800,7 +800,7 @@ export class Tag {
    * @param callback The callback
    */
   getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
+  getEntityStateByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagGetEntityStateByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -843,7 +843,7 @@ export class Tag {
    * @param callback The callback
    */
   getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
+  getByProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagGetByProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -886,7 +886,7 @@ export class Tag {
    * @param callback The callback
    */
   assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options: Models.TagAssignToProductOptionalParams, callback: msRest.ServiceCallback<Models.TagContract>): void;
-  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: Models.TagAssignToProductOptionalParams, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
+  assignToProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, options?: Models.TagAssignToProductOptionalParams | msRest.ServiceCallback<Models.TagContract>, callback?: msRest.ServiceCallback<Models.TagContract>): Promise<Models.TagAssignToProductResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -935,7 +935,7 @@ export class Tag {
    * @param callback The callback
    */
   detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  detachFromProduct(resourceGroupName: string, serviceName: string, productId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -967,7 +967,7 @@ export class Tag {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -995,7 +995,7 @@ export class Tag {
    * @param callback The callback
    */
   listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1023,7 +1023,7 @@ export class Tag {
    * @param callback The callback
    */
   listByOperationNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
+  listByOperationNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByOperationNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
@@ -1051,7 +1051,7 @@ export class Tag {
    * @param callback The callback
    */
   listByProductNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagCollection>): void;
-  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
+  listByProductNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagCollection>, callback?: msRest.ServiceCallback<Models.TagCollection>): Promise<Models.TagListByProductNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tagDescription.ts b/packages/@azure/arm-apimanagement/lib/operations/tagDescription.ts
index 555bed575e7f..63c05059f756 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tagDescription.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tagDescription.ts
@@ -54,7 +54,7 @@ export class TagDescription {
    * @param callback The callback
    */
   listByApi(resourceGroupName: string, serviceName: string, apiId: string, options: Models.TagDescriptionListByApiOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagDescriptionListByApiOptionalParams, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.TagDescriptionListByApiResponse> {
+  listByApi(resourceGroupName: string, serviceName: string, apiId: string, options?: Models.TagDescriptionListByApiOptionalParams | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.TagDescriptionListByApiResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -96,7 +96,7 @@ export class TagDescription {
    * @param callback The callback
    */
   getEntityState(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityState(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.TagDescriptionGetEntityStateResponse> {
+  getEntityState(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.TagDescriptionGetEntityStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -139,7 +139,7 @@ export class TagDescription {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.TagDescriptionGetResponse> {
+  get(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.TagDescriptionGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -185,7 +185,7 @@ export class TagDescription {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options: Models.TagDescriptionCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.TagDescriptionContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.TagDescriptionCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.TagDescriptionCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, parameters: Models.TagDescriptionCreateParameters, options?: Models.TagDescriptionCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.TagDescriptionContract>, callback?: msRest.ServiceCallback<Models.TagDescriptionContract>): Promise<Models.TagDescriptionCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -235,7 +235,7 @@ export class TagDescription {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, apiId: string, tagId: string, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -268,7 +268,7 @@ export class TagDescription {
    * @param callback The callback
    */
   listByApiNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagDescriptionCollection>): void;
-  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.TagDescriptionListByApiNextResponse> {
+  listByApiNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagDescriptionCollection>, callback?: msRest.ServiceCallback<Models.TagDescriptionCollection>): Promise<Models.TagDescriptionListByApiNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tagResource.ts b/packages/@azure/arm-apimanagement/lib/operations/tagResource.ts
index 8cd3487ebd09..ecd0d59977eb 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tagResource.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tagResource.ts
@@ -47,7 +47,7 @@ export class TagResource {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.TagResourceListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.TagResourceListByServiceOptionalParams | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -76,7 +76,7 @@ export class TagResource {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TagResourceCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TagResourceCollection>, callback?: msRest.ServiceCallback<Models.TagResourceCollection>): Promise<Models.TagResourceListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tenantAccess.ts b/packages/@azure/arm-apimanagement/lib/operations/tenantAccess.ts
index 0b74db035401..bddd2b35df6d 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tenantAccess.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tenantAccess.ts
@@ -47,7 +47,7 @@ export class TenantAccess {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -88,7 +88,7 @@ export class TenantAccess {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, parameters: Models.AccessInformationUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -122,7 +122,7 @@ export class TenantAccess {
    * @param callback The callback
    */
   regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -154,7 +154,7 @@ export class TenantAccess {
    * @param callback The callback
    */
   regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tenantAccessGit.ts b/packages/@azure/arm-apimanagement/lib/operations/tenantAccessGit.ts
index 8c00a814246f..1fe7ca57af15 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tenantAccessGit.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tenantAccessGit.ts
@@ -47,7 +47,7 @@ export class TenantAccessGit {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.AccessInformationContract>): void;
-  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
+  get(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.AccessInformationContract>, callback?: msRest.ServiceCallback<Models.AccessInformationContract>): Promise<Models.TenantAccessGitGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -79,7 +79,7 @@ export class TenantAccessGit {
    * @param callback The callback
    */
   regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regeneratePrimaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -111,7 +111,7 @@ export class TenantAccessGit {
    * @param callback The callback
    */
   regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  regenerateSecondaryKey(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/tenantConfiguration.ts b/packages/@azure/arm-apimanagement/lib/operations/tenantConfiguration.ts
index 3ece01dcd474..a73436264797 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/tenantConfiguration.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/tenantConfiguration.ts
@@ -91,7 +91,7 @@ export class TenantConfiguration {
    * @param callback The callback
    */
   getSyncState(resourceGroupName: string, serviceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): void;
-  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
+  getSyncState(resourceGroupName: string, serviceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>, callback?: msRest.ServiceCallback<Models.TenantConfigurationSyncStateContract>): Promise<Models.TenantConfigurationGetSyncStateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/user.ts b/packages/@azure/arm-apimanagement/lib/operations/user.ts
index 8d583c3e4c92..4506135601f3 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/user.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/user.ts
@@ -47,7 +47,7 @@ export class User {
    * @param callback The callback
    */
   listByService(resourceGroupName: string, serviceName: string, options: Models.UserListByServiceOptionalParams, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
+  listByService(resourceGroupName: string, serviceName: string, options?: Models.UserListByServiceOptionalParams | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -82,7 +82,7 @@ export class User {
    * @param callback The callback
    */
   getEntityTag(resourceGroupName: string, serviceName: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  getEntityTag(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
+  getEntityTag(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<Models.UserGetEntityTagResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -118,7 +118,7 @@ export class User {
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  get(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
+  get(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserGetResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -157,7 +157,7 @@ export class User {
    * @param callback The callback
    */
   createOrUpdate(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserCreateParameters, options: Models.UserCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback<Models.UserContract>): void;
-  createOrUpdate(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
+  createOrUpdate(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserCreateParameters, options?: Models.UserCreateOrUpdateOptionalParams | msRest.ServiceCallback<Models.UserContract>, callback?: msRest.ServiceCallback<Models.UserContract>): Promise<Models.UserCreateOrUpdateResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -203,7 +203,7 @@ export class User {
    * @param callback The callback
    */
   update(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserUpdateParameters, ifMatch: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  update(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  update(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserUpdateParameters, ifMatch: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -247,7 +247,7 @@ export class User {
    * @param callback The callback
    */
   deleteMethod(resourceGroupName: string, serviceName: string, uid: string, ifMatch: string, options: Models.UserDeleteMethodOptionalParams, callback: msRest.ServiceCallback<void>): void;
-  deleteMethod(resourceGroupName: string, serviceName: string, uid: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  deleteMethod(resourceGroupName: string, serviceName: string, uid: string, ifMatch: string, options?: Models.UserDeleteMethodOptionalParams | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -285,7 +285,7 @@ export class User {
    * @param callback The callback
    */
   generateSsoUrl(resourceGroupName: string, serviceName: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): void;
-  generateSsoUrl(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
+  generateSsoUrl(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GenerateSsoUrlResult>, callback?: msRest.ServiceCallback<Models.GenerateSsoUrlResult>): Promise<Models.UserGenerateSsoUrlResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -324,7 +324,7 @@ export class User {
    * @param callback The callback
    */
   getSharedAccessToken(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserTokenParameters, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserTokenResult>): void;
-  getSharedAccessToken(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
+  getSharedAccessToken(resourceGroupName: string, serviceName: string, uid: string, parameters: Models.UserTokenParameters, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserTokenResult>, callback?: msRest.ServiceCallback<Models.UserTokenResult>): Promise<Models.UserGetSharedAccessTokenResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -355,7 +355,7 @@ export class User {
    * @param callback The callback
    */
   listByServiceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserCollection>): void;
-  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
+  listByServiceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserCollection>, callback?: msRest.ServiceCallback<Models.UserCollection>): Promise<Models.UserListByServiceNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/userGroup.ts b/packages/@azure/arm-apimanagement/lib/operations/userGroup.ts
index 3b6beea08b86..7d6404fb5f7b 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/userGroup.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/userGroup.ts
@@ -50,7 +50,7 @@ export class UserGroup {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, uid: string, options: Models.UserGroupListOptionalParams, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  list(resourceGroupName: string, serviceName: string, uid: string, options?: Models.UserGroupListOptionalParams, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
+  list(resourceGroupName: string, serviceName: string, uid: string, options?: Models.UserGroupListOptionalParams | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class UserGroup {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.GroupCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.GroupCollection>, callback?: msRest.ServiceCallback<Models.GroupCollection>): Promise<Models.UserGroupListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/userIdentities.ts b/packages/@azure/arm-apimanagement/lib/operations/userIdentities.ts
index 90f9eb26b078..97b275170d67 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/userIdentities.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/userIdentities.ts
@@ -50,7 +50,7 @@ export class UserIdentities {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, uid: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  list(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
+  list(resourceGroupName: string, serviceName: string, uid: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class UserIdentities {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.UserIdentityCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.UserIdentityCollection>, callback?: msRest.ServiceCallback<Models.UserIdentityCollection>): Promise<Models.UserIdentitiesListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/lib/operations/userSubscription.ts b/packages/@azure/arm-apimanagement/lib/operations/userSubscription.ts
index a5e8246cb60b..321f379746f5 100644
--- a/packages/@azure/arm-apimanagement/lib/operations/userSubscription.ts
+++ b/packages/@azure/arm-apimanagement/lib/operations/userSubscription.ts
@@ -50,7 +50,7 @@ export class UserSubscription {
    * @param callback The callback
    */
   list(resourceGroupName: string, serviceName: string, uid: string, options: Models.UserSubscriptionListOptionalParams, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  list(resourceGroupName: string, serviceName: string, uid: string, options?: Models.UserSubscriptionListOptionalParams, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
+  list(resourceGroupName: string, serviceName: string, uid: string, options?: Models.UserSubscriptionListOptionalParams | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -80,7 +80,7 @@ export class UserSubscription {
    * @param callback The callback
    */
   listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SubscriptionCollection>): void;
-  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
+  listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SubscriptionCollection>, callback?: msRest.ServiceCallback<Models.SubscriptionCollection>): Promise<Models.UserSubscriptionListNextResponse> {
     return this.client.sendOperationRequest(
       {
         nextPageLink,
diff --git a/packages/@azure/arm-apimanagement/package.json b/packages/@azure/arm-apimanagement/package.json
index ecd4835aeb00..b84c87e73e3a 100644
--- a/packages/@azure/arm-apimanagement/package.json
+++ b/packages/@azure/arm-apimanagement/package.json
@@ -5,7 +5,7 @@
   "version": "0.1.0",
   "dependencies": {
     "ms-rest-azure-js": "^1.0.181",
-    "ms-rest-js": "^1.0.457",
+    "ms-rest-js": "^1.0.460",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -52,4 +52,4 @@
     "prepack": "npm install && npm run build"
   },
   "sideEffects": false
-}
\ No newline at end of file
+}