diff --git a/lib/services/automationManagement/lib/automationClient.d.ts b/lib/services/automationManagement/lib/automationClient.d.ts
index f1d8dc4cac..56d13310df 100644
--- a/lib/services/automationManagement/lib/automationClient.d.ts
+++ b/lib/services/automationManagement/lib/automationClient.d.ts
@@ -92,6 +92,7 @@ export default class AutomationClient extends AzureServiceClient {
   dscCompilationJobOperations: operations.DscCompilationJobOperations;
   dscCompilationJobStream: operations.DscCompilationJobStream;
   dscNodeConfigurationOperations: operations.DscNodeConfigurationOperations;
+  watcherOperations: operations.WatcherOperations;
 }
 
 export { AutomationClient, models as AutomationModels };
diff --git a/lib/services/automationManagement/lib/automationClient.js b/lib/services/automationManagement/lib/automationClient.js
index ccbbfeef5e..6376309468 100644
--- a/lib/services/automationManagement/lib/automationClient.js
+++ b/lib/services/automationManagement/lib/automationClient.js
@@ -109,6 +109,7 @@ class AutomationClient extends ServiceClient {
     this.dscCompilationJobOperations = new operations.DscCompilationJobOperations(this);
     this.dscCompilationJobStream = new operations.DscCompilationJobStream(this);
     this.dscNodeConfigurationOperations = new operations.DscNodeConfigurationOperations(this);
+    this.watcherOperations = new operations.WatcherOperations(this);
     this.models = models;
     msRest.addSerializationMixin(this);
   }
diff --git a/lib/services/automationManagement/lib/models/activityParameter.js b/lib/services/automationManagement/lib/models/activityParameter.js
index 9938816f29..f11092053b 100644
--- a/lib/services/automationManagement/lib/models/activityParameter.js
+++ b/lib/services/automationManagement/lib/models/activityParameter.js
@@ -24,7 +24,7 @@ class ActivityParameter {
    * parameter is optional.
    * @member {boolean} [isDynamic] Gets or sets a Boolean value that indicates
    * true if the parameter is dynamic.
-   * @member {boolean} [position] Gets or sets the position of the activity
+   * @member {number} [position] Gets or sets the position of the activity
    * parameter.
    * @member {boolean} [valueFromPipeline] Gets or sets a Boolean value that
    * indicates true if the parameter can take values from the incoming pipeline
@@ -91,7 +91,7 @@ class ActivityParameter {
             required: false,
             serializedName: 'position',
             type: {
-              name: 'Boolean'
+              name: 'Number'
             }
           },
           valueFromPipeline: {
diff --git a/lib/services/automationManagement/lib/models/agentRegistrationRegenerateKeyParameter.js b/lib/services/automationManagement/lib/models/agentRegistrationRegenerateKeyParameter.js
index 4c7e0e4f9c..d02751a8d0 100644
--- a/lib/services/automationManagement/lib/models/agentRegistrationRegenerateKeyParameter.js
+++ b/lib/services/automationManagement/lib/models/agentRegistrationRegenerateKeyParameter.js
@@ -19,9 +19,6 @@ class AgentRegistrationRegenerateKeyParameter {
    * Create a AgentRegistrationRegenerateKeyParameter.
    * @member {string} keyName Gets or sets the agent registration key name -
    * primary or secondary. Possible values include: 'primary', 'secondary'
-   * @member {string} [name] Gets or sets the name of the resource.
-   * @member {string} [location] Gets or sets the location of the resource.
-   * @member {object} [tags] Gets or sets the tags attached to the resource.
    */
   constructor() {
   }
@@ -46,34 +43,6 @@ class AgentRegistrationRegenerateKeyParameter {
             type: {
               name: 'String'
             }
-          },
-          name: {
-            required: false,
-            serializedName: 'name',
-            type: {
-              name: 'String'
-            }
-          },
-          location: {
-            required: false,
-            serializedName: 'location',
-            type: {
-              name: 'String'
-            }
-          },
-          tags: {
-            required: false,
-            serializedName: 'tags',
-            type: {
-              name: 'Dictionary',
-              value: {
-                  required: false,
-                  serializedName: 'StringElementType',
-                  type: {
-                    name: 'String'
-                  }
-              }
-            }
           }
         }
       }
diff --git a/lib/services/automationManagement/lib/models/dscCompilationJob.js b/lib/services/automationManagement/lib/models/dscCompilationJob.js
index e33fe69c1f..bbe31f6259 100644
--- a/lib/services/automationManagement/lib/models/dscCompilationJob.js
+++ b/lib/services/automationManagement/lib/models/dscCompilationJob.js
@@ -26,11 +26,9 @@ class DscCompilationJob extends models['ProxyResource'] {
    * @member {string} [startedBy] Gets the compilation job started by.
    * @member {uuid} [jobId] Gets the id of the job.
    * @member {date} [creationTime] Gets the creation time of the job.
-   * @member {object} [provisioningState] The current provisioning state of the
-   * job.
-   * @member {string} [provisioningState.provisioningState] The provisioning
-   * state of the resource. Possible values include: 'Failed', 'Succeeded',
-   * 'Suspended', 'Processing'
+   * @member {string} [provisioningState] The current provisioning state of the
+   * job. Possible values include: 'Failed', 'Succeeded', 'Suspended',
+   * 'Processing'
    * @member {string} [runOn] Gets or sets the runOn which specifies the group
    * name where the job is to be executed.
    * @member {string} [status] Gets or sets the status of the job. Possible
@@ -125,8 +123,7 @@ class DscCompilationJob extends models['ProxyResource'] {
             required: false,
             serializedName: 'properties.provisioningState',
             type: {
-              name: 'Composite',
-              className: 'JobProvisioningStateProperty'
+              name: 'String'
             }
           },
           runOn: {
diff --git a/lib/services/automationManagement/lib/models/dscCompilationJobCreateParameters.js b/lib/services/automationManagement/lib/models/dscCompilationJobCreateParameters.js
index 364f2c99a6..7a0bc57812 100644
--- a/lib/services/automationManagement/lib/models/dscCompilationJobCreateParameters.js
+++ b/lib/services/automationManagement/lib/models/dscCompilationJobCreateParameters.js
@@ -23,8 +23,8 @@ class DscCompilationJobCreateParameters {
    * @member {string} [configuration.name] Gets or sets the name of the Dsc
    * configuration.
    * @member {object} [parameters] Gets or sets the parameters of the job.
-   * @member {boolean} [newNodeConfigurationBuildVersionRequired] If a new
-   * build version of NodeConfiguration is required.
+   * @member {boolean} [incrementNodeConfigurationBuild] If a new build version
+   * of NodeConfiguration is required.
    * @member {string} [name] Gets or sets name of the resource.
    * @member {string} [location] Gets or sets the location of the resource.
    * @member {object} [tags] Gets or sets the tags attached to the resource.
@@ -68,9 +68,9 @@ class DscCompilationJobCreateParameters {
               }
             }
           },
-          newNodeConfigurationBuildVersionRequired: {
+          incrementNodeConfigurationBuild: {
             required: false,
-            serializedName: 'properties.newNodeConfigurationBuildVersionRequired',
+            serializedName: 'properties.incrementNodeConfigurationBuild',
             type: {
               name: 'Boolean'
             }
diff --git a/lib/services/automationManagement/lib/models/dscNodeUpdateParameters.js b/lib/services/automationManagement/lib/models/dscNodeUpdateParameters.js
index b5bb93583d..b7cf090e73 100644
--- a/lib/services/automationManagement/lib/models/dscNodeUpdateParameters.js
+++ b/lib/services/automationManagement/lib/models/dscNodeUpdateParameters.js
@@ -20,10 +20,6 @@ class DscNodeUpdateParameters {
   /**
    * Create a DscNodeUpdateParameters.
    * @member {string} [nodeId] Gets or sets the id of the dsc node.
-   * @member {object} [nodeConfiguration] Gets or sets the configuration of the
-   * node.
-   * @member {string} [nodeConfiguration.name] Gets or sets the name of the dsc
-   * nodeconfiguration.
    * @member {object} [properties]
    * @member {string} [properties.name] Gets or sets the name of the dsc
    * nodeconfiguration.
@@ -52,14 +48,6 @@ class DscNodeUpdateParameters {
               name: 'String'
             }
           },
-          nodeConfiguration: {
-            required: false,
-            serializedName: 'nodeConfiguration',
-            type: {
-              name: 'Composite',
-              className: 'DscNodeConfigurationAssociationProperty'
-            }
-          },
           properties: {
             required: false,
             serializedName: 'properties',
diff --git a/lib/services/automationManagement/lib/models/index.d.ts b/lib/services/automationManagement/lib/models/index.d.ts
index 9f6d41d765..e46718cf48 100644
--- a/lib/services/automationManagement/lib/models/index.d.ts
+++ b/lib/services/automationManagement/lib/models/index.d.ts
@@ -33,272 +33,322 @@ export interface ErrorResponse {
 
 /**
  * @class
- * Initializes a new instance of the Key class.
+ * Initializes a new instance of the Resource class.
  * @constructor
- * Automation key which is used to register a DSC Node
+ * The core properties of ARM resources
  *
- * @member {string} [keyName] Automation key name. Possible values include:
- * 'primary', 'secondary'
- * @member {string} [permissions] Automation key permissions. Possible values
- * include: 'Full'
- * @member {string} [value] Value of the Automation Key used for registration.
+ * @member {string} [id] Fully qualified resource Id for the resource
+ * @member {string} [name] The name of the resource
+ * @member {string} [type] The type of the resource.
  */
-export interface Key {
-  keyName?: string;
-  permissions?: string;
-  value?: string;
+export interface Resource extends BaseResource {
+  readonly id?: string;
+  readonly name?: string;
+  readonly type?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the UsageCounterName class.
+ * Initializes a new instance of the TrackedResource class.
  * @constructor
- * Definition of usage counter name.
+ * The resource model definition for a ARM tracked top level resource
  *
- * @member {string} [value] Gets or sets the usage counter name.
- * @member {string} [localizedValue] Gets or sets the localized usage counter
- * name.
+ * @member {object} [tags] Resource tags.
+ * @member {string} [location] The Azure Region where the resource lives
  */
-export interface UsageCounterName {
-  value?: string;
-  localizedValue?: string;
+export interface TrackedResource extends Resource {
+  tags?: { [propertyName: string]: string };
+  location?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the Usage class.
+ * Initializes a new instance of the ProxyResource class.
  * @constructor
- * Definition of Usage.
+ * ARM proxy resource.
  *
- * @member {string} [id] Gets or sets the id of the resource.
- * @member {object} [name] Gets or sets the usage counter name.
- * @member {string} [name.value] Gets or sets the usage counter name.
- * @member {string} [name.localizedValue] Gets or sets the localized usage
- * counter name.
- * @member {string} [unit] Gets or sets the usage unit name.
- * @member {number} [currentValue] Gets or sets the current usage value.
- * @member {number} [limit] Gets or sets max limit. -1 for unlimited
- * @member {string} [throttleStatus] Gets or sets the throttle status.
  */
-export interface Usage {
-  id?: string;
-  name?: UsageCounterName;
-  unit?: string;
-  currentValue?: number;
-  limit?: number;
-  throttleStatus?: string;
+export interface ProxyResource extends Resource {
 }
 
 /**
  * @class
- * Initializes a new instance of the Statistics class.
+ * Initializes a new instance of the Sku class.
  * @constructor
- * Definition of the statistic.
+ * The account SKU.
  *
- * @member {string} [counterProperty] Gets the property value of the statistic.
- * @member {number} [counterValue] Gets the value of the statistic.
- * @member {date} [startTime] Gets the startTime of the statistic.
- * @member {date} [endTime] Gets the endTime of the statistic.
- * @member {string} [id] Gets the id.
+ * @member {string} name Gets or sets the SKU name of the account. Possible
+ * values include: 'Free', 'Basic'
+ * @member {string} [family] Gets or sets the SKU family.
+ * @member {number} [capacity] Gets or sets the SKU capacity.
  */
-export interface Statistics {
-  readonly counterProperty?: string;
-  readonly counterValue?: number;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  readonly id?: string;
+export interface Sku {
+  name: string;
+  family?: string;
+  capacity?: number;
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookAssociationProperty class.
+ * Initializes a new instance of the AutomationAccount class.
  * @constructor
- * The runbook property associated with the entity.
+ * Definition of the automation account type.
  *
- * @member {string} [name] Gets or sets the name of the runbook.
+ * @member {object} [sku] Gets or sets the SKU of account.
+ * @member {string} [sku.name] Gets or sets the SKU name of the account.
+ * Possible values include: 'Free', 'Basic'
+ * @member {string} [sku.family] Gets or sets the SKU family.
+ * @member {number} [sku.capacity] Gets or sets the SKU capacity.
+ * @member {string} [lastModifiedBy] Gets or sets the last modified by.
+ * @member {string} [state] Gets status of account. Possible values include:
+ * 'Ok', 'Unavailable', 'Suspended'
+ * @member {date} [creationTime] Gets the creation time.
+ * @member {date} [lastModifiedTime] Gets the last modified time.
+ * @member {string} [description] Gets or sets the description.
+ * @member {string} [etag] Gets or sets the etag of the resource.
  */
-export interface RunbookAssociationProperty {
+export interface AutomationAccount extends TrackedResource {
+  sku?: Sku;
+  lastModifiedBy?: string;
+  readonly state?: string;
+  readonly creationTime?: Date;
+  readonly lastModifiedTime?: Date;
+  description?: string;
+  etag?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the AutomationAccountCreateOrUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the create or update automation account
+ * operation.
+ *
+ * @member {object} [sku] Gets or sets account SKU.
+ * @member {string} [sku.name] Gets or sets the SKU name of the account.
+ * Possible values include: 'Free', 'Basic'
+ * @member {string} [sku.family] Gets or sets the SKU family.
+ * @member {number} [sku.capacity] Gets or sets the SKU capacity.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
+ */
+export interface AutomationAccountCreateOrUpdateParameters {
+  sku?: Sku;
   name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the Resource class.
+ * Initializes a new instance of the OperationDisplay class.
  * @constructor
- * The core properties of ARM resources
+ * Provider, Resource and Operation values
  *
- * @member {string} [id] Fully qualified resource Id for the resource
- * @member {string} [name] The name of the resource
- * @member {string} [type] The type of the resource.
+ * @member {string} [provider] Service provider: Microsoft.Automation
+ * @member {string} [resource] Resource on which the operation is performed:
+ * Runbooks, Jobs etc.
+ * @member {string} [operation] Operation type: Read, write, delete, etc.
  */
-export interface Resource extends BaseResource {
-  readonly id?: string;
-  readonly name?: string;
-  readonly type?: string;
+export interface OperationDisplay {
+  provider?: string;
+  resource?: string;
+  operation?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ProxyResource class.
+ * Initializes a new instance of the Operation class.
  * @constructor
- * The resource model definition for a ARM proxy resource. It will have
- * everything other than required location and tags
+ * Automation REST API operation
  *
+ * @member {string} [name] Operation name: {provider}/{resource}/{operation}
+ * @member {object} [display] Provider, Resource and Operation values
+ * @member {string} [display.provider] Service provider: Microsoft.Automation
+ * @member {string} [display.resource] Resource on which the operation is
+ * performed: Runbooks, Jobs etc.
+ * @member {string} [display.operation] Operation type: Read, write, delete,
+ * etc.
  */
-export interface ProxyResource extends Resource {
+export interface Operation {
+  name?: string;
+  display?: OperationDisplay;
 }
 
 /**
  * @class
- * Initializes a new instance of the Webhook class.
+ * Initializes a new instance of the Statistics class.
  * @constructor
- * Definition of the webhook type.
+ * Definition of the statistic.
  *
- * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
- * the webhook. Default value: false .
- * @member {string} [uri] Gets or sets the webhook uri.
- * @member {date} [expiryTime] Gets or sets the expiry time.
- * @member {date} [lastInvokedTime] Gets or sets the last invoked time.
- * @member {object} [parameters] Gets or sets the parameters of the job that is
- * created when the webhook calls the runbook it is associated with.
- * @member {object} [runbook] Gets or sets the runbook the webhook is
- * associated with.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {string} [runOn] Gets or sets the name of the hybrid worker group
- * the webhook job will run on.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [lastModifiedBy] Details of the user who last modified the
- * Webhook
- * @member {string} [description] Gets or sets the description.
+ * @member {string} [counterProperty] Gets the property value of the statistic.
+ * @member {number} [counterValue] Gets the value of the statistic.
+ * @member {date} [startTime] Gets the startTime of the statistic.
+ * @member {date} [endTime] Gets the endTime of the statistic.
+ * @member {string} [id] Gets the id.
  */
-export interface Webhook extends ProxyResource {
-  isEnabled?: boolean;
-  uri?: string;
-  expiryTime?: Date;
-  lastInvokedTime?: Date;
-  parameters?: { [propertyName: string]: string };
-  runbook?: RunbookAssociationProperty;
-  runOn?: string;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  lastModifiedBy?: string;
-  description?: string;
+export interface Statistics {
+  readonly counterProperty?: string;
+  readonly counterValue?: number;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  readonly id?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the Variable class.
+ * Initializes a new instance of the UsageCounterName class.
  * @constructor
- * Definition of the varible.
+ * Definition of usage counter name.
  *
- * @member {string} [value] Gets or sets the value of the variable.
- * @member {boolean} [isEncrypted] Gets or sets the encrypted flag of the
- * variable.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [description] Gets or sets the description.
+ * @member {string} [value] Gets or sets the usage counter name.
+ * @member {string} [localizedValue] Gets or sets the localized usage counter
+ * name.
  */
-export interface Variable extends ProxyResource {
+export interface UsageCounterName {
   value?: string;
-  isEncrypted?: boolean;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  description?: string;
+  localizedValue?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the JobProvisioningStateProperty class.
+ * Initializes a new instance of the Usage class.
  * @constructor
- * The provisioning state property.
+ * Definition of Usage.
  *
- * @member {string} [provisioningState] The provisioning state of the resource.
- * Possible values include: 'Failed', 'Succeeded', 'Suspended', 'Processing'
+ * @member {string} [id] Gets or sets the id of the resource.
+ * @member {object} [name] Gets or sets the usage counter name.
+ * @member {string} [name.value] Gets or sets the usage counter name.
+ * @member {string} [name.localizedValue] Gets or sets the localized usage
+ * counter name.
+ * @member {string} [unit] Gets or sets the usage unit name.
+ * @member {number} [currentValue] Gets or sets the current usage value.
+ * @member {number} [limit] Gets or sets max limit. -1 for unlimited
+ * @member {string} [throttleStatus] Gets or sets the throttle status.
  */
-export interface JobProvisioningStateProperty {
-  readonly provisioningState?: string;
+export interface Usage {
+  id?: string;
+  name?: UsageCounterName;
+  unit?: string;
+  currentValue?: number;
+  limit?: number;
+  throttleStatus?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscConfigurationAssociationProperty class.
+ * Initializes a new instance of the Key class.
  * @constructor
- * The Dsc configuration property associated with the entity.
+ * Automation key which is used to register a DSC Node
  *
- * @member {string} [name] Gets or sets the name of the Dsc configuration.
+ * @member {string} [keyName] Automation key name. Possible values include:
+ * 'Primary', 'Secondary'
+ * @member {string} [permissions] Automation key permissions. Possible values
+ * include: 'Read', 'Full'
+ * @member {string} [value] Value of the Automation Key used for registration.
  */
-export interface DscConfigurationAssociationProperty {
-  name?: string;
+export interface Key {
+  readonly keyName?: string;
+  readonly permissions?: string;
+  readonly value?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscCompilationJob class.
+ * Initializes a new instance of the KeyListResult class.
  * @constructor
- * Definition of the Dsc Compilation job.
- *
- * @member {object} [configuration] Gets or sets the configuration.
- * @member {string} [configuration.name] Gets or sets the name of the Dsc
- * configuration.
- * @member {string} [startedBy] Gets the compilation job started by.
- * @member {uuid} [jobId] Gets the id of the job.
- * @member {date} [creationTime] Gets the creation time of the job.
- * @member {object} [provisioningState] The current provisioning state of the
- * job.
- * @member {string} [provisioningState.provisioningState] The provisioning
- * state of the resource. Possible values include: 'Failed', 'Succeeded',
- * 'Suspended', 'Processing'
- * @member {string} [runOn] Gets or sets the runOn which specifies the group
- * name where the job is to be executed.
- * @member {string} [status] Gets or sets the status of the job. Possible
- * values include: 'New', 'Activating', 'Running', 'Completed', 'Failed',
- * 'Stopped', 'Blocked', 'Suspended', 'Disconnected', 'Suspending', 'Stopping',
- * 'Resuming', 'Removing'
- * @member {string} [statusDetails] Gets or sets the status details of the job.
- * @member {date} [startTime] Gets the start time of the job.
- * @member {date} [endTime] Gets the end time of the job.
- * @member {string} [exception] Gets the exception of the job.
- * @member {date} [lastModifiedTime] Gets the last modified time of the job.
- * @member {date} [lastStatusModifiedTime] Gets the last status modified time
- * of the job.
- * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {array} [keys] Lists the automation keys.
  */
-export interface DscCompilationJob extends ProxyResource {
-  configuration?: DscConfigurationAssociationProperty;
-  readonly startedBy?: string;
-  readonly jobId?: string;
-  readonly creationTime?: Date;
-  provisioningState?: JobProvisioningStateProperty;
-  runOn?: string;
-  status?: string;
-  statusDetails?: string;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  readonly exception?: string;
-  readonly lastModifiedTime?: Date;
-  readonly lastStatusModifiedTime?: Date;
-  parameters?: { [propertyName: string]: string };
+export interface KeyListResult {
+  keys?: Key[];
 }
 
 /**
  * @class
- * Initializes a new instance of the Credential class.
+ * Initializes a new instance of the AutomationAccountUpdateParameters class.
  * @constructor
- * Definition of the credential.
+ * The parameters supplied to the update automation account operation.
  *
- * @member {string} [userName] Gets the user name of the credential.
+ * @member {object} [sku] Gets or sets account SKU.
+ * @member {string} [sku.name] Gets or sets the SKU name of the account.
+ * Possible values include: 'Free', 'Basic'
+ * @member {string} [sku.family] Gets or sets the SKU family.
+ * @member {number} [sku.capacity] Gets or sets the SKU capacity.
+ * @member {string} [name] Gets or sets the name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
+ */
+export interface AutomationAccountUpdateParameters {
+  sku?: Sku;
+  name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
+}
+
+/**
+ * @class
+ * Initializes a new instance of the CertificateCreateOrUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the create or update or replace certificate
+ * operation.
+ *
+ * @member {string} name Gets or sets the name of the certificate.
+ * @member {string} base64Value Gets or sets the base64 encoded value of the
+ * certificate.
+ * @member {string} [description] Gets or sets the description of the
+ * certificate.
+ * @member {string} [thumbprint] Gets or sets the thumbprint of the
+ * certificate.
+ * @member {boolean} [isExportable] Gets or sets the is exportable flag of the
+ * certificate.
+ */
+export interface CertificateCreateOrUpdateParameters {
+  name: string;
+  base64Value: string;
+  description?: string;
+  thumbprint?: string;
+  isExportable?: boolean;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the Certificate class.
+ * @constructor
+ * Definition of the certificate.
+ *
+ * @member {string} [thumbprint] Gets the thumbprint of the certificate.
+ * @member {date} [expiryTime] Gets the expiry time of the certificate.
+ * @member {boolean} [isExportable] Gets the is exportable flag of the
+ * certificate.
  * @member {date} [creationTime] Gets the creation time.
  * @member {date} [lastModifiedTime] Gets the last modified time.
  * @member {string} [description] Gets or sets the description.
  */
-export interface Credential extends ProxyResource {
-  readonly userName?: string;
+export interface Certificate extends ProxyResource {
+  readonly thumbprint?: string;
+  readonly expiryTime?: Date;
+  readonly isExportable?: boolean;
   readonly creationTime?: Date;
   readonly lastModifiedTime?: Date;
   description?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the CertificateUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the update certificate operation.
+ *
+ * @member {string} [name] Gets or sets the name of the certificate.
+ * @member {string} [description] Gets or sets the description of the
+ * certificate.
+ */
+export interface CertificateUpdateParameters {
+  name?: string;
+  description?: string;
+}
+
 /**
  * @class
  * Initializes a new instance of the ConnectionTypeAssociationProperty class.
@@ -311,6 +361,29 @@ export interface ConnectionTypeAssociationProperty {
   name?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the ConnectionCreateOrUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the create or update connection operation.
+ *
+ * @member {string} name Gets or sets the name of the connection.
+ * @member {string} [description] Gets or sets the description of the
+ * connection.
+ * @member {object} connectionType Gets or sets the connectionType of the
+ * connection.
+ * @member {string} [connectionType.name] Gets or sets the name of the
+ * connection type.
+ * @member {object} [fieldDefinitionValues] Gets or sets the field definition
+ * properties of the connection.
+ */
+export interface ConnectionCreateOrUpdateParameters {
+  name: string;
+  description?: string;
+  connectionType: ConnectionTypeAssociationProperty;
+  fieldDefinitionValues?: { [propertyName: string]: string };
+}
+
 /**
  * @class
  * Initializes a new instance of the Connection class.
@@ -337,268 +410,156 @@ export interface Connection extends ProxyResource {
 
 /**
  * @class
- * Initializes a new instance of the Certificate class.
+ * Initializes a new instance of the ConnectionUpdateParameters class.
  * @constructor
- * Definition of the certificate.
+ * The parameters supplied to the update connection operation.
  *
- * @member {string} [thumbprint] Gets the thumbprint of the certificate.
- * @member {date} [expiryTime] Gets the expiry time of the certificate.
- * @member {boolean} [isExportable] Gets the is exportable flag of the
- * certificate.
- * @member {date} [creationTime] Gets the creation time.
- * @member {date} [lastModifiedTime] Gets the last modified time.
- * @member {string} [description] Gets or sets the description.
+ * @member {string} [name] Gets or sets the name of the connection.
+ * @member {string} [description] Gets or sets the description of the
+ * connection.
+ * @member {object} [fieldDefinitionValues] Gets or sets the field definition
+ * values of the connection.
  */
-export interface Certificate extends ProxyResource {
-  readonly thumbprint?: string;
-  readonly expiryTime?: Date;
-  readonly isExportable?: boolean;
-  readonly creationTime?: Date;
-  readonly lastModifiedTime?: Date;
+export interface ConnectionUpdateParameters {
+  name?: string;
   description?: string;
+  fieldDefinitionValues?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookParameter class.
+ * Initializes a new instance of the FieldDefinition class.
  * @constructor
- * Definition of the runbook parameter type.
+ * Definition of the connection fields.
  *
- * @member {string} [type] Gets or sets the type of the parameter.
- * @member {boolean} [isMandatory] Gets or sets a Boolean value to indicate
- * whether the parameter is madatory or not.
- * @member {number} [position] Get or sets the position of the parameter.
- * @member {string} [defaultValue] Gets or sets the default value of parameter.
+ * @member {boolean} [isEncrypted] Gets or sets the isEncrypted flag of the
+ * connection field definition.
+ * @member {boolean} [isOptional] Gets or sets the isOptional flag of the
+ * connection field definition.
+ * @member {string} type Gets or sets the type of the connection field
+ * definition.
  */
-export interface RunbookParameter {
-  type?: string;
-  isMandatory?: boolean;
-  position?: number;
-  defaultValue?: string;
+export interface FieldDefinition {
+  isEncrypted?: boolean;
+  isOptional?: boolean;
+  type: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ContentHash class.
+ * Initializes a new instance of the ConnectionType class.
  * @constructor
- * Definition of the runbook property type.
+ * Definition of the connection type.
  *
- * @member {string} algorithm Gets or sets the content hash algorithm used to
- * hash the content.
- * @member {string} value Gets or sets expected hash value of the content.
+ * @member {string} [id] Gets the id of the resource.
+ * @member {string} [name] Gets the name of the connection type.
+ * @member {string} [type] Resource type
+ * @member {boolean} [isGlobal] Gets or sets a Boolean value to indicate if the
+ * connection type is global.
+ * @member {object} [fieldDefinitions] Gets the field definitions of the
+ * connection type.
+ * @member {date} [creationTime] Gets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
  */
-export interface ContentHash {
-  algorithm: string;
-  value: string;
+export interface ConnectionType {
+  readonly id?: string;
+  readonly name?: string;
+  readonly type?: string;
+  isGlobal?: boolean;
+  readonly fieldDefinitions?: { [propertyName: string]: FieldDefinition };
+  readonly creationTime?: Date;
+  lastModifiedTime?: Date;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ContentLink class.
+ * Initializes a new instance of the ConnectionTypeCreateOrUpdateParameters class.
  * @constructor
- * Definition of the content link.
+ * The parameters supplied to the create or update connection type operation.
  *
- * @member {string} [uri] Gets or sets the uri of the runbook content.
- * @member {object} [contentHash] Gets or sets the hash.
- * @member {string} [contentHash.algorithm] Gets or sets the content hash
- * algorithm used to hash the content.
- * @member {string} [contentHash.value] Gets or sets expected hash value of the
- * content.
- * @member {string} [version] Gets or sets the version of the content.
+ * @member {string} name Gets or sets the name of the connection type.
+ * @member {boolean} [isGlobal] Gets or sets a Boolean value to indicate if the
+ * connection type is global.
+ * @member {object} fieldDefinitions Gets or sets the field definitions of the
+ * connection type.
  */
-export interface ContentLink {
-  uri?: string;
-  contentHash?: ContentHash;
-  version?: string;
+export interface ConnectionTypeCreateOrUpdateParameters {
+  name: string;
+  isGlobal?: boolean;
+  fieldDefinitions: { [propertyName: string]: FieldDefinition };
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookDraft class.
+ * Initializes a new instance of the CredentialCreateOrUpdateParameters class.
  * @constructor
- * Definition of the runbook type.
+ * The parameters supplied to the create or update credential operation.
  *
- * @member {boolean} [inEdit] Gets or sets whether runbook is in edit mode.
- * @member {object} [draftContentLink] Gets or sets the draft runbook content
- * link.
- * @member {string} [draftContentLink.uri] Gets or sets the uri of the runbook
- * content.
- * @member {object} [draftContentLink.contentHash] Gets or sets the hash.
- * @member {string} [draftContentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [draftContentLink.contentHash.value] Gets or sets expected
- * hash value of the content.
- * @member {string} [draftContentLink.version] Gets or sets the version of the
- * content.
- * @member {date} [creationTime] Gets or sets the creation time of the runbook
- * draft.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
- * runbook draft.
- * @member {object} [parameters] Gets or sets the runbook draft parameters.
- * @member {array} [outputTypes] Gets or sets the runbook output types.
- */
-export interface RunbookDraft {
-  inEdit?: boolean;
-  draftContentLink?: ContentLink;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  parameters?: { [propertyName: string]: RunbookParameter };
-  outputTypes?: string[];
-}
-
-/**
- * @class
- * Initializes a new instance of the TrackedResource class.
- * @constructor
- * The resource model definition for a ARM tracked top level resource
- *
- * @member {object} [tags] Resource tags.
- * @member {string} [location] The Azure Region where the resource lives
+ * @member {string} name Gets or sets the name of the credential.
+ * @member {string} userName Gets or sets the user name of the credential.
+ * @member {string} password Gets or sets the password of the credential.
+ * @member {string} [description] Gets or sets the description of the
+ * credential.
  */
-export interface TrackedResource extends Resource {
-  tags?: { [propertyName: string]: string };
-  location?: string;
+export interface CredentialCreateOrUpdateParameters {
+  name: string;
+  userName: string;
+  password: string;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the Runbook class.
+ * Initializes a new instance of the Credential class.
  * @constructor
- * Definition of the runbook type.
+ * Definition of the credential.
  *
- * @member {string} [runbookType] Gets or sets the type of the runbook.
- * Possible values include: 'Script', 'Graph', 'PowerShellWorkflow',
- * 'PowerShell', 'GraphPowerShellWorkflow', 'GraphPowerShell'
- * @member {object} [publishContentLink] Gets or sets the published runbook
- * content link.
- * @member {string} [publishContentLink.uri] Gets or sets the uri of the
- * runbook content.
- * @member {object} [publishContentLink.contentHash] Gets or sets the hash.
- * @member {string} [publishContentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [publishContentLink.contentHash.value] Gets or sets
- * expected hash value of the content.
- * @member {string} [publishContentLink.version] Gets or sets the version of
- * the content.
- * @member {string} [state] Gets or sets the state of the runbook. Possible
- * values include: 'New', 'Edit', 'Published'
- * @member {boolean} [logVerbose] Gets or sets verbose log option.
- * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {number} [logActivityTrace] Gets or sets the option to log activity
- * trace of the runbook.
- * @member {number} [jobCount] Gets or sets the job count of the runbook.
- * @member {object} [parameters] Gets or sets the runbook parameters.
- * @member {array} [outputTypes] Gets or sets the runbook output types.
- * @member {object} [draft] Gets or sets the draft runbook properties.
- * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
- * mode.
- * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
- * content link.
- * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
- * runbook content.
- * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
- * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
- * the content hash algorithm used to hash the content.
- * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
- * expected hash value of the content.
- * @member {string} [draft.draftContentLink.version] Gets or sets the version
- * of the content.
- * @member {date} [draft.creationTime] Gets or sets the creation time of the
- * runbook draft.
- * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
- * of the runbook draft.
- * @member {object} [draft.parameters] Gets or sets the runbook draft
- * parameters.
- * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
- * @member {string} [provisioningState] Gets or sets the provisioning state of
- * the runbook. Possible values include: 'Succeeded'
- * @member {string} [lastModifiedBy] Gets or sets the last modified by.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [userName] Gets the user name of the credential.
+ * @member {date} [creationTime] Gets the creation time.
+ * @member {date} [lastModifiedTime] Gets the last modified time.
  * @member {string} [description] Gets or sets the description.
- * @member {string} [etag] Gets or sets the etag of the resource.
  */
-export interface Runbook extends TrackedResource {
-  runbookType?: string;
-  publishContentLink?: ContentLink;
-  state?: string;
-  logVerbose?: boolean;
-  logProgress?: boolean;
-  logActivityTrace?: number;
-  jobCount?: number;
-  parameters?: { [propertyName: string]: RunbookParameter };
-  outputTypes?: string[];
-  draft?: RunbookDraft;
-  provisioningState?: string;
-  lastModifiedBy?: string;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
+export interface Credential extends ProxyResource {
+  readonly userName?: string;
+  readonly creationTime?: Date;
+  readonly lastModifiedTime?: Date;
   description?: string;
-  etag?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ModuleErrorInfo class.
+ * Initializes a new instance of the CredentialUpdateParameters class.
  * @constructor
- * Definition of the module error info type.
+ * The parameters supplied to the Update credential operation.
  *
- * @member {string} [code] Gets or sets the error code.
- * @member {string} [message] Gets or sets the error message.
+ * @member {string} [name] Gets or sets the name of the credential.
+ * @member {string} [userName] Gets or sets the user name of the credential.
+ * @member {string} [password] Gets or sets the password of the credential.
+ * @member {string} [description] Gets or sets the description of the
+ * credential.
  */
-export interface ModuleErrorInfo {
-  code?: string;
-  message?: string;
+export interface CredentialUpdateParameters {
+  name?: string;
+  userName?: string;
+  password?: string;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the Module class.
+ * Initializes a new instance of the ContentHash class.
  * @constructor
- * Definition of the module type.
+ * Definition of the runbook property type.
  *
- * @member {boolean} [isGlobal] Gets or sets the isGlobal flag of the module.
- * @member {string} [version] Gets or sets the version of the module.
- * @member {number} [sizeInBytes] Gets or sets the size in bytes of the module.
- * @member {number} [activityCount] Gets or sets the activity count of the
- * module.
- * @member {string} [provisioningState] Gets or sets the provisioning state of
- * the module. Possible values include: 'Created', 'Creating',
- * 'StartingImportModuleRunbook', 'RunningImportModuleRunbook',
- * 'ContentRetrieved', 'ContentDownloaded', 'ContentValidated',
- * 'ConnectionTypeImported', 'ContentStored', 'ModuleDataStored',
- * 'ActivitiesStored', 'ModuleImportRunbookComplete', 'Succeeded', 'Failed',
- * 'Cancelled', 'Updating'
- * @member {object} [contentLink] Gets or sets the contentLink of the module.
- * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
- * content.
- * @member {object} [contentLink.contentHash] Gets or sets the hash.
- * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
- * value of the content.
- * @member {string} [contentLink.version] Gets or sets the version of the
- * content.
- * @member {object} [error] Gets or sets the error info of the module.
- * @member {string} [error.code] Gets or sets the error code.
- * @member {string} [error.message] Gets or sets the error message.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [description] Gets or sets the description.
- * @member {string} [etag] Gets or sets the etag of the resource.
+ * @member {string} algorithm Gets or sets the content hash algorithm used to
+ * hash the content.
+ * @member {string} value Gets or sets expected hash value of the content.
  */
-export interface Module extends TrackedResource {
-  isGlobal?: boolean;
-  version?: string;
-  sizeInBytes?: number;
-  activityCount?: number;
-  provisioningState?: string;
-  contentLink?: ContentLink;
-  error?: ModuleErrorInfo;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  description?: string;
-  etag?: string;
+export interface ContentHash {
+  algorithm: string;
+  value: string;
 }
 
 /**
@@ -644,6 +605,43 @@ export interface DscConfigurationParameter {
   defaultValue?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the DscConfigurationCreateOrUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the create or update configuration operation.
+ *
+ * @member {boolean} [logVerbose] Gets or sets verbose log option.
+ * @member {boolean} [logProgress] Gets or sets progress log option.
+ * @member {object} source Gets or sets the source.
+ * @member {object} [source.hash] Gets or sets the hash.
+ * @member {string} [source.hash.algorithm] Gets or sets the content hash
+ * algorithm used to hash the content.
+ * @member {string} [source.hash.value] Gets or sets expected hash value of the
+ * content.
+ * @member {string} [source.type] Gets or sets the content source type.
+ * Possible values include: 'embeddedContent', 'uri'
+ * @member {string} [source.value] Gets or sets the value of the content. This
+ * is based on the content source type.
+ * @member {string} [source.version] Gets or sets the version of the content.
+ * @member {object} [parameters] Gets or sets the configuration parameters.
+ * @member {string} [description] Gets or sets the description of the
+ * configuration.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
+ */
+export interface DscConfigurationCreateOrUpdateParameters {
+  logVerbose?: boolean;
+  logProgress?: boolean;
+  source: ContentSource;
+  parameters?: { [propertyName: string]: DscConfigurationParameter };
+  description?: string;
+  name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
+}
+
 /**
  * @class
  * Initializes a new instance of the DscConfiguration class.
@@ -691,360 +689,238 @@ export interface DscConfiguration extends TrackedResource {
 
 /**
  * @class
- * Initializes a new instance of the Sku class.
+ * Initializes a new instance of the DscConfigurationUpdateParameters class.
  * @constructor
- * The account SKU.
+ * The parameters supplied to the create or update configuration operation.
  *
- * @member {string} name Gets or sets the SKU name of the account. Possible
- * values include: 'Free', 'Basic'
- * @member {string} [family] Gets or sets the SKU family.
- * @member {number} [capacity] Gets or sets the SKU capacity.
+ * @member {boolean} [logVerbose] Gets or sets verbose log option.
+ * @member {boolean} [logProgress] Gets or sets progress log option.
+ * @member {object} source Gets or sets the source.
+ * @member {object} [source.hash] Gets or sets the hash.
+ * @member {string} [source.hash.algorithm] Gets or sets the content hash
+ * algorithm used to hash the content.
+ * @member {string} [source.hash.value] Gets or sets expected hash value of the
+ * content.
+ * @member {string} [source.type] Gets or sets the content source type.
+ * Possible values include: 'embeddedContent', 'uri'
+ * @member {string} [source.value] Gets or sets the value of the content. This
+ * is based on the content source type.
+ * @member {string} [source.version] Gets or sets the version of the content.
+ * @member {object} [parameters] Gets or sets the configuration parameters.
+ * @member {string} [description] Gets or sets the description of the
+ * configuration.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
  */
-export interface Sku {
-  name: string;
-  family?: string;
-  capacity?: number;
+export interface DscConfigurationUpdateParameters {
+  logVerbose?: boolean;
+  logProgress?: boolean;
+  source: ContentSource;
+  parameters?: { [propertyName: string]: DscConfigurationParameter };
+  description?: string;
+  name?: string;
+  tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the AutomationAccount class.
+ * Initializes a new instance of the RunAsCredentialAssociationProperty class.
  * @constructor
- * Definition of the automation account type.
+ * Definition of runas credential to use for hybrid worker.
  *
- * @member {object} [sku] Gets or sets the SKU of account.
- * @member {string} [sku.name] Gets or sets the SKU name of the account.
- * Possible values include: 'Free', 'Basic'
- * @member {string} [sku.family] Gets or sets the SKU family.
- * @member {number} [sku.capacity] Gets or sets the SKU capacity.
- * @member {string} [lastModifiedBy] Gets or sets the last modified by.
- * @member {string} [state] Gets status of account. Possible values include:
- * 'Ok', 'Unavailable', 'Suspended'
- * @member {date} [creationTime] Gets the creation time.
- * @member {date} [lastModifiedTime] Gets the last modified time.
- * @member {string} [description] Gets or sets the description.
- * @member {string} [etag] Gets or sets the etag of the resource.
+ * @member {string} [name] Gets or sets the name of the credential.
  */
-export interface AutomationAccount extends TrackedResource {
-  sku?: Sku;
-  lastModifiedBy?: string;
-  readonly state?: string;
-  readonly creationTime?: Date;
-  readonly lastModifiedTime?: Date;
-  description?: string;
-  etag?: string;
+export interface RunAsCredentialAssociationProperty {
+  name?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the OperationDisplay class.
+ * Initializes a new instance of the HybridRunbookWorker class.
  * @constructor
- * Provider, Resource and Operation values
+ * Definition of hybrid runbook worker.
  *
- * @member {string} [provider] Service provider: Microsoft.Automation
- * @member {string} [resource] Resource on which the operation is performed:
- * Runbooks, Jobs etc.
- * @member {string} [operation] Operation type: Read, write, delete, etc.
+ * @member {string} [name] Gets or sets the worker machine name.
+ * @member {string} [ip] Gets or sets the assigned machine IP address.
+ * @member {date} [registrationTime] Gets or sets the registration time of the
+ * worker machine.
+ * @member {date} [lastSeenDateTime] Last Heartbeat from the Worker
  */
-export interface OperationDisplay {
-  provider?: string;
-  resource?: string;
-  operation?: string;
+export interface HybridRunbookWorker {
+  name?: string;
+  ip?: string;
+  registrationTime?: Date;
+  lastSeenDateTime?: Date;
 }
 
 /**
  * @class
- * Initializes a new instance of the Operation class.
+ * Initializes a new instance of the HybridRunbookWorkerGroup class.
  * @constructor
- * Automation REST API operation
+ * Definition of hybrid runbook worker group.
  *
- * @member {string} [name] Operation name: {provider}/{resource}/{operation}
- * @member {object} [display] Provider, Resource and Operation values
- * @member {string} [display.provider] Service provider: Microsoft.Automation
- * @member {string} [display.resource] Resource on which the operation is
- * performed: Runbooks, Jobs etc.
- * @member {string} [display.operation] Operation type: Read, write, delete,
- * etc.
+ * @member {string} [id] Gets or sets the id of the resource.
+ * @member {string} [name] Gets or sets the name of the group.
+ * @member {array} [hybridRunbookWorkers] Gets or sets the list of hybrid
+ * runbook workers.
+ * @member {object} [credential] Sets the credential of a worker group.
+ * @member {string} [credential.name] Gets or sets the name of the credential.
+ * @member {string} [groupType] Type of the HybridWorkerGroup. Possible values
+ * include: 'User', 'System'
  */
-export interface Operation {
+export interface HybridRunbookWorkerGroup {
+  id?: string;
   name?: string;
-  display?: OperationDisplay;
+  hybridRunbookWorkers?: HybridRunbookWorker[];
+  credential?: RunAsCredentialAssociationProperty;
+  groupType?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the AutomationAccountCreateOrUpdateParameters class.
+ * Initializes a new instance of the HybridRunbookWorkerGroupUpdateParameters class.
  * @constructor
- * The parameters supplied to the create or update automation account
- * operation.
+ * Parameters supplied to the update operation.
  *
- * @member {object} [sku] Gets or sets account SKU.
- * @member {string} [sku.name] Gets or sets the SKU name of the account.
- * Possible values include: 'Free', 'Basic'
- * @member {string} [sku.family] Gets or sets the SKU family.
- * @member {number} [sku.capacity] Gets or sets the SKU capacity.
- * @member {string} [name] Gets or sets name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {object} [credential] Sets the credential of a worker group.
+ * @member {string} [credential.name] Gets or sets the name of the credential.
  */
-export interface AutomationAccountCreateOrUpdateParameters {
-  sku?: Sku;
-  name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+export interface HybridRunbookWorkerGroupUpdateParameters {
+  credential?: RunAsCredentialAssociationProperty;
 }
 
 /**
  * @class
- * Initializes a new instance of the AutomationAccountUpdateParameters class.
+ * Initializes a new instance of the ScheduleAssociationProperty class.
  * @constructor
- * The parameters supplied to the update automation account operation.
+ * The schedule property associated with the entity.
  *
- * @member {object} [sku] Gets or sets account SKU.
- * @member {string} [sku.name] Gets or sets the SKU name of the account.
- * Possible values include: 'Free', 'Basic'
- * @member {string} [sku.family] Gets or sets the SKU family.
- * @member {number} [sku.capacity] Gets or sets the SKU capacity.
- * @member {string} [name] Gets or sets the name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {string} [name] Gets or sets the name of the Schedule.
  */
-export interface AutomationAccountUpdateParameters {
-  sku?: Sku;
+export interface ScheduleAssociationProperty {
   name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the CertificateUpdateParameters class.
+ * Initializes a new instance of the RunbookAssociationProperty class.
  * @constructor
- * The parameters supplied to the update certificate operation.
+ * The runbook property associated with the entity.
  *
- * @member {string} [name] Gets or sets the name of the certificate.
- * @member {string} [description] Gets or sets the description of the
- * certificate.
+ * @member {string} [name] Gets or sets the name of the runbook.
  */
-export interface CertificateUpdateParameters {
+export interface RunbookAssociationProperty {
   name?: string;
-  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the CertificateCreateOrUpdateParameters class.
+ * Initializes a new instance of the JobSchedule class.
  * @constructor
- * The parameters supplied to the create or update or replace certificate
- * operation.
+ * Definition of the job schedule.
  *
- * @member {string} name Gets or sets the name of the certificate.
- * @member {string} base64Value Gets or sets the base64 encoded value of the
- * certificate.
- * @member {string} [description] Gets or sets the description of the
- * certificate.
- * @member {string} [thumbprint] Gets or sets the thumbprint of the
- * certificate.
- * @member {boolean} [isExportable] Gets or sets the is exportable flag of the
- * certificate.
+ * @member {string} [id] Gets the id of the resource.
+ * @member {string} [name] Gets the name of the variable.
+ * @member {string} [type] Resource type
+ * @member {string} [jobScheduleId] Gets or sets the id of job schedule.
+ * @member {object} [schedule] Gets or sets the schedule.
+ * @member {string} [schedule.name] Gets or sets the name of the Schedule.
+ * @member {object} [runbook] Gets or sets the runbook.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {string} [runOn] Gets or sets the hybrid worker group that the
+ * scheduled job should run on.
+ * @member {object} [parameters] Gets or sets the parameters of the job
+ * schedule.
  */
-export interface CertificateCreateOrUpdateParameters {
-  name: string;
-  base64Value: string;
-  description?: string;
-  thumbprint?: string;
-  isExportable?: boolean;
+export interface JobSchedule {
+  readonly id?: string;
+  readonly name?: string;
+  readonly type?: string;
+  jobScheduleId?: string;
+  schedule?: ScheduleAssociationProperty;
+  runbook?: RunbookAssociationProperty;
+  runOn?: string;
+  parameters?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the ConnectionUpdateParameters class.
+ * Initializes a new instance of the JobScheduleCreateParameters class.
  * @constructor
- * The parameters supplied to the update connection operation.
+ * The parameters supplied to the create job schedule operation.
  *
- * @member {string} [name] Gets or sets the name of the connection.
- * @member {string} [description] Gets or sets the description of the
- * connection.
- * @member {object} [fieldDefinitionValues] Gets or sets the field definition
- * values of the connection.
+ * @member {object} schedule Gets or sets the schedule.
+ * @member {string} [schedule.name] Gets or sets the name of the Schedule.
+ * @member {object} runbook Gets or sets the runbook.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {string} [runOn] Gets or sets the hybrid worker group that the
+ * scheduled job should run on.
+ * @member {object} [parameters] Gets or sets a list of job properties.
  */
-export interface ConnectionUpdateParameters {
-  name?: string;
-  description?: string;
-  fieldDefinitionValues?: { [propertyName: string]: string };
+export interface JobScheduleCreateParameters {
+  schedule: ScheduleAssociationProperty;
+  runbook: RunbookAssociationProperty;
+  runOn?: string;
+  parameters?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the ConnectionCreateOrUpdateParameters class.
+ * Initializes a new instance of the LinkedWorkspace class.
  * @constructor
- * The parameters supplied to the create or update connection operation.
+ * Definition of the linked workspace.
  *
- * @member {string} name Gets or sets the name of the connection.
- * @member {string} [description] Gets or sets the description of the
- * connection.
- * @member {object} connectionType Gets or sets the connectionType of the
- * connection.
- * @member {string} [connectionType.name] Gets or sets the name of the
- * connection type.
- * @member {object} [fieldDefinitionValues] Gets or sets the field definition
- * properties of the connection.
+ * @member {string} [id] Gets the id of the linked workspace.
  */
-export interface ConnectionCreateOrUpdateParameters {
-  name: string;
-  description?: string;
-  connectionType: ConnectionTypeAssociationProperty;
-  fieldDefinitionValues?: { [propertyName: string]: string };
+export interface LinkedWorkspace {
+  readonly id?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the FieldDefinition class.
+ * Initializes a new instance of the ActivityParameter class.
  * @constructor
- * Definition of the connection fields.
+ * Definition of the activity parameter.
  *
- * @member {boolean} [isEncrypted] Gets or sets the isEncrypted flag of the
- * connection field definition.
- * @member {boolean} [isOptional] Gets or sets the isOptional flag of the
- * connection field definition.
- * @member {string} type Gets or sets the type of the connection field
- * definition.
+ * @member {string} [name] Gets or sets the name of the activity parameter.
+ * @member {string} [type] Gets or sets the type of the activity parameter.
+ * @member {boolean} [isMandatory] Gets or sets a Boolean value that indicates
+ * true if the parameter is required. If the value is false, the parameter is
+ * optional.
+ * @member {boolean} [isDynamic] Gets or sets a Boolean value that indicates
+ * true if the parameter is dynamic.
+ * @member {number} [position] Gets or sets the position of the activity
+ * parameter.
+ * @member {boolean} [valueFromPipeline] Gets or sets a Boolean value that
+ * indicates true if the parameter can take values from the incoming pipeline
+ * objects. This setting is used if the cmdlet must access the complete input
+ * object. false indicates that the parameter cannot take values from the
+ * complete input object.
+ * @member {boolean} [valueFromPipelineByPropertyName] Gets or sets a Boolean
+ * value that indicates true if the parameter can be filled from a property of
+ * the incoming pipeline object that has the same name as this parameter. false
+ * indicates that the parameter cannot be filled from the incoming pipeline
+ * object property with the same name.
+ * @member {boolean} [valueFromRemainingArguments] Gets or sets a Boolean value
+ * that indicates true if the cmdlet parameter accepts all the remaining
+ * command-line arguments that are associated with this parameter in the form
+ * of an array. false if the cmdlet parameter does not accept all the remaining
+ * argument values.
  */
-export interface FieldDefinition {
-  isEncrypted?: boolean;
-  isOptional?: boolean;
-  type: string;
+export interface ActivityParameter {
+  name?: string;
+  type?: string;
+  isMandatory?: boolean;
+  isDynamic?: boolean;
+  position?: number;
+  valueFromPipeline?: boolean;
+  valueFromPipelineByPropertyName?: boolean;
+  valueFromRemainingArguments?: boolean;
 }
 
 /**
  * @class
- * Initializes a new instance of the ConnectionType class.
- * @constructor
- * Definition of the connection type.
- *
- * @member {string} [id] Gets the id of the resource.
- * @member {string} [name] Gets the name of the connection type.
- * @member {string} [type] Resource type
- * @member {boolean} [isGlobal] Gets or sets a Boolean value to indicate if the
- * connection type is global.
- * @member {object} [fieldDefinitions] Gets the field definitions of the
- * connection type.
- * @member {date} [creationTime] Gets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [description] Gets or sets the description.
- */
-export interface ConnectionType {
-  readonly id?: string;
-  readonly name?: string;
-  readonly type?: string;
-  isGlobal?: boolean;
-  readonly fieldDefinitions?: { [propertyName: string]: FieldDefinition };
-  readonly creationTime?: Date;
-  lastModifiedTime?: Date;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the ConnectionTypeCreateOrUpdateParameters class.
- * @constructor
- * The parameters supplied to the create or update connection type operation.
- *
- * @member {string} name Gets or sets the name of the connection type.
- * @member {boolean} [isGlobal] Gets or sets a Boolean value to indicate if the
- * connection type is global.
- * @member {object} fieldDefinitions Gets or sets the field definitions of the
- * connection type.
- */
-export interface ConnectionTypeCreateOrUpdateParameters {
-  name: string;
-  isGlobal?: boolean;
-  fieldDefinitions: { [propertyName: string]: FieldDefinition };
-}
-
-/**
- * @class
- * Initializes a new instance of the CredentialUpdateParameters class.
- * @constructor
- * The parameters supplied to the Update credential operation.
- *
- * @member {string} [name] Gets or sets the name of the credential.
- * @member {string} [userName] Gets or sets the user name of the credential.
- * @member {string} [password] Gets or sets the password of the credential.
- * @member {string} [description] Gets or sets the description of the
- * credential.
- */
-export interface CredentialUpdateParameters {
-  name?: string;
-  userName?: string;
-  password?: string;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the CredentialCreateOrUpdateParameters class.
- * @constructor
- * The parameters supplied to the create or update credential operation.
- *
- * @member {string} name Gets or sets the name of the credential.
- * @member {string} userName Gets or sets the user name of the credential.
- * @member {string} password Gets or sets the password of the credential.
- * @member {string} [description] Gets or sets the description of the
- * credential.
- */
-export interface CredentialCreateOrUpdateParameters {
-  name: string;
-  userName: string;
-  password: string;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the ActivityParameter class.
- * @constructor
- * Definition of the activity parameter.
- *
- * @member {string} [name] Gets or sets the name of the activity parameter.
- * @member {string} [type] Gets or sets the type of the activity parameter.
- * @member {boolean} [isMandatory] Gets or sets a Boolean value that indicates
- * true if the parameter is required. If the value is false, the parameter is
- * optional.
- * @member {boolean} [isDynamic] Gets or sets a Boolean value that indicates
- * true if the parameter is dynamic.
- * @member {boolean} [position] Gets or sets the position of the activity
- * parameter.
- * @member {boolean} [valueFromPipeline] Gets or sets a Boolean value that
- * indicates true if the parameter can take values from the incoming pipeline
- * objects. This setting is used if the cmdlet must access the complete input
- * object. false indicates that the parameter cannot take values from the
- * complete input object.
- * @member {boolean} [valueFromPipelineByPropertyName] Gets or sets a Boolean
- * value that indicates true if the parameter can be filled from a property of
- * the incoming pipeline object that has the same name as this parameter. false
- * indicates that the parameter cannot be filled from the incoming pipeline
- * object property with the same name.
- * @member {boolean} [valueFromRemainingArguments] Gets or sets a Boolean value
- * that indicates true if the cmdlet parameter accepts all the remaining
- * command-line arguments that are associated with this parameter in the form
- * of an array. false if the cmdlet parameter does not accept all the remaining
- * argument values.
- */
-export interface ActivityParameter {
-  name?: string;
-  type?: string;
-  isMandatory?: boolean;
-  isDynamic?: boolean;
-  position?: boolean;
-  valueFromPipeline?: boolean;
-  valueFromPipelineByPropertyName?: boolean;
-  valueFromRemainingArguments?: boolean;
-}
-
-/**
- * @class
- * Initializes a new instance of the ActivityParameterSet class.
+ * Initializes a new instance of the ActivityParameterSet class.
  * @constructor
  * Definition of the activity parameter set.
  *
@@ -1100,88 +976,137 @@ export interface Activity {
 
 /**
  * @class
- * Initializes a new instance of the AdvancedScheduleMonthlyOccurrence class.
+ * Initializes a new instance of the ModuleErrorInfo class.
  * @constructor
- * The properties of the create advanced schedule monthly occurrence.
+ * Definition of the module error info type.
  *
- * @member {number} [occurrence] Occurrence of the week within the month. Must
- * be between 1 and 5
- * @member {string} [day] Day of the occurrence. Must be one of monday,
- * tuesday, wednesday, thursday, friday, saturday, sunday. Possible values
- * include: 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday',
- * 'Sunday'
+ * @member {string} [code] Gets or sets the error code.
+ * @member {string} [message] Gets or sets the error message.
  */
-export interface AdvancedScheduleMonthlyOccurrence {
-  occurrence?: number;
-  day?: string;
+export interface ModuleErrorInfo {
+  code?: string;
+  message?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the AdvancedSchedule class.
+ * Initializes a new instance of the ContentLink class.
  * @constructor
- * The properties of the create Advanced Schedule.
+ * Definition of the content link.
  *
- * @member {array} [weekDays] Days of the week that the job should execute on.
- * @member {array} [monthDays] Days of the month that the job should execute
- * on. Must be between 1 and 31.
- * @member {array} [monthlyOccurrences] Occurrences of days within a month.
+ * @member {string} [uri] Gets or sets the uri of the runbook content.
+ * @member {object} [contentHash] Gets or sets the hash.
+ * @member {string} [contentHash.algorithm] Gets or sets the content hash
+ * algorithm used to hash the content.
+ * @member {string} [contentHash.value] Gets or sets expected hash value of the
+ * content.
+ * @member {string} [version] Gets or sets the version of the content.
  */
-export interface AdvancedSchedule {
-  weekDays?: string[];
-  monthDays?: number[];
-  monthlyOccurrences?: AdvancedScheduleMonthlyOccurrence[];
+export interface ContentLink {
+  uri?: string;
+  contentHash?: ContentHash;
+  version?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the AgentRegistrationKeys class.
+ * Initializes a new instance of the Module class.
  * @constructor
- * Definition of the agent registration keys.
+ * Definition of the module type.
  *
- * @member {string} [primary] Gets or sets the primary key.
- * @member {string} [secondary] Gets or sets the secondary key.
+ * @member {boolean} [isGlobal] Gets or sets the isGlobal flag of the module.
+ * @member {string} [version] Gets or sets the version of the module.
+ * @member {number} [sizeInBytes] Gets or sets the size in bytes of the module.
+ * @member {number} [activityCount] Gets or sets the activity count of the
+ * module.
+ * @member {string} [provisioningState] Gets or sets the provisioning state of
+ * the module. Possible values include: 'Created', 'Creating',
+ * 'StartingImportModuleRunbook', 'RunningImportModuleRunbook',
+ * 'ContentRetrieved', 'ContentDownloaded', 'ContentValidated',
+ * 'ConnectionTypeImported', 'ContentStored', 'ModuleDataStored',
+ * 'ActivitiesStored', 'ModuleImportRunbookComplete', 'Succeeded', 'Failed',
+ * 'Cancelled', 'Updating'
+ * @member {object} [contentLink] Gets or sets the contentLink of the module.
+ * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
+ * content.
+ * @member {object} [contentLink.contentHash] Gets or sets the hash.
+ * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
+ * value of the content.
+ * @member {string} [contentLink.version] Gets or sets the version of the
+ * content.
+ * @member {object} [error] Gets or sets the error info of the module.
+ * @member {string} [error.code] Gets or sets the error code.
+ * @member {string} [error.message] Gets or sets the error message.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
+ * @member {string} [etag] Gets or sets the etag of the resource.
  */
-export interface AgentRegistrationKeys {
-  primary?: string;
-  secondary?: string;
+export interface Module extends TrackedResource {
+  isGlobal?: boolean;
+  version?: string;
+  sizeInBytes?: number;
+  activityCount?: number;
+  provisioningState?: string;
+  contentLink?: ContentLink;
+  error?: ModuleErrorInfo;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  description?: string;
+  etag?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the AgentRegistration class.
+ * Initializes a new instance of the ModuleCreateOrUpdateParameters class.
  * @constructor
- * Definition of the agent registration infomration type.
+ * The parameters supplied to the create or update module operation.
  *
- * @member {string} [dscMetaConfiguration] Gets or sets the dsc meta
- * configuration.
- * @member {string} [endpoint] Gets or sets the dsc server endpoint.
- * @member {object} [keys] Gets or sets the agent registration keys.
- * @member {string} [keys.primary] Gets or sets the primary key.
- * @member {string} [keys.secondary] Gets or sets the secondary key.
- * @member {string} [id] Gets or sets the id.
+ * @member {object} contentLink Gets or sets the module content link.
+ * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
+ * content.
+ * @member {object} [contentLink.contentHash] Gets or sets the hash.
+ * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
+ * value of the content.
+ * @member {string} [contentLink.version] Gets or sets the version of the
+ * content.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
  */
-export interface AgentRegistration {
-  dscMetaConfiguration?: string;
-  endpoint?: string;
-  keys?: AgentRegistrationKeys;
-  id?: string;
+export interface ModuleCreateOrUpdateParameters {
+  contentLink: ContentLink;
+  name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the AgentRegistrationRegenerateKeyParameter class.
+ * Initializes a new instance of the ModuleUpdateParameters class.
  * @constructor
- * The parameters supplied to the regenerate keys operation.
+ * The parameters supplied to the update module operation.
  *
- * @member {string} keyName Gets or sets the agent registration key name -
- * primary or secondary. Possible values include: 'primary', 'secondary'
- * @member {string} [name] Gets or sets the name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [contentLink] Gets or sets the module content link.
+ * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
+ * content.
+ * @member {object} [contentLink.contentHash] Gets or sets the hash.
+ * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
+ * value of the content.
+ * @member {string} [contentLink.version] Gets or sets the version of the
+ * content.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
  * @member {object} [tags] Gets or sets the tags attached to the resource.
  */
-export interface AgentRegistrationRegenerateKeyParameter {
-  keyName: string;
+export interface ModuleUpdateParameters {
+  contentLink?: ContentLink;
   name?: string;
   location?: string;
   tags?: { [propertyName: string]: string };
@@ -1189,27 +1114,16 @@ export interface AgentRegistrationRegenerateKeyParameter {
 
 /**
  * @class
- * Initializes a new instance of the DscCompilationJobCreateParameters class.
+ * Initializes a new instance of the TypeField class.
  * @constructor
- * The parameters supplied to the create compilation job operation.
+ * Information about a field of a type.
  *
- * @member {object} configuration Gets or sets the configuration.
- * @member {string} [configuration.name] Gets or sets the name of the Dsc
- * configuration.
- * @member {object} [parameters] Gets or sets the parameters of the job.
- * @member {boolean} [newNodeConfigurationBuildVersionRequired] If a new build
- * version of NodeConfiguration is required.
- * @member {string} [name] Gets or sets name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {string} [name] Gets or sets the name of the field.
+ * @member {string} [type] Gets or sets the type of the field.
  */
-export interface DscCompilationJobCreateParameters {
-  configuration: DscConfigurationAssociationProperty;
-  parameters?: { [propertyName: string]: string };
-  newNodeConfigurationBuildVersionRequired?: boolean;
+export interface TypeField {
   name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+  type?: string;
 }
 
 /**
@@ -1239,1140 +1153,735 @@ export interface JobStream {
 
 /**
  * @class
- * Initializes a new instance of the DscConfigurationCreateOrUpdateParameters class.
+ * Initializes a new instance of the RunbookParameter class.
  * @constructor
- * The parameters supplied to the create or update configuration operation.
+ * Definition of the runbook parameter type.
+ *
+ * @member {string} [type] Gets or sets the type of the parameter.
+ * @member {boolean} [isMandatory] Gets or sets a Boolean value to indicate
+ * whether the parameter is madatory or not.
+ * @member {number} [position] Get or sets the position of the parameter.
+ * @member {string} [defaultValue] Gets or sets the default value of parameter.
+ */
+export interface RunbookParameter {
+  type?: string;
+  isMandatory?: boolean;
+  position?: number;
+  defaultValue?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the RunbookDraft class.
+ * @constructor
+ * @member {boolean} [inEdit] Gets or sets whether runbook is in edit mode.
+ * @member {object} [draftContentLink] Gets or sets the draft runbook content
+ * link.
+ * @member {string} [draftContentLink.uri] Gets or sets the uri of the runbook
+ * content.
+ * @member {object} [draftContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [draftContentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [draftContentLink.contentHash.value] Gets or sets expected
+ * hash value of the content.
+ * @member {string} [draftContentLink.version] Gets or sets the version of the
+ * content.
+ * @member {date} [creationTime] Gets or sets the creation time of the runbook
+ * draft.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
+ * runbook draft.
+ * @member {object} [parameters] Gets or sets the runbook draft parameters.
+ * @member {array} [outputTypes] Gets or sets the runbook output types.
+ */
+export interface RunbookDraft {
+  inEdit?: boolean;
+  draftContentLink?: ContentLink;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  parameters?: { [propertyName: string]: RunbookParameter };
+  outputTypes?: string[];
+}
+
+/**
+ * @class
+ * Initializes a new instance of the Runbook class.
+ * @constructor
+ * Definition of the runbook type.
  *
+ * @member {string} [runbookType] Gets or sets the type of the runbook.
+ * Possible values include: 'Script', 'Graph', 'PowerShellWorkflow',
+ * 'PowerShell', 'GraphPowerShellWorkflow', 'GraphPowerShell'
+ * @member {object} [publishContentLink] Gets or sets the published runbook
+ * content link.
+ * @member {string} [publishContentLink.uri] Gets or sets the uri of the
+ * runbook content.
+ * @member {object} [publishContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [publishContentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [publishContentLink.contentHash.value] Gets or sets
+ * expected hash value of the content.
+ * @member {string} [publishContentLink.version] Gets or sets the version of
+ * the content.
+ * @member {string} [state] Gets or sets the state of the runbook. Possible
+ * values include: 'New', 'Edit', 'Published'
  * @member {boolean} [logVerbose] Gets or sets verbose log option.
  * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {object} source Gets or sets the source.
- * @member {object} [source.hash] Gets or sets the hash.
- * @member {string} [source.hash.algorithm] Gets or sets the content hash
- * algorithm used to hash the content.
- * @member {string} [source.hash.value] Gets or sets expected hash value of the
- * content.
- * @member {string} [source.type] Gets or sets the content source type.
- * Possible values include: 'embeddedContent', 'uri'
- * @member {string} [source.value] Gets or sets the value of the content. This
- * is based on the content source type.
- * @member {string} [source.version] Gets or sets the version of the content.
- * @member {object} [parameters] Gets or sets the configuration parameters.
- * @member {string} [description] Gets or sets the description of the
- * configuration.
- * @member {string} [name] Gets or sets name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {number} [logActivityTrace] Gets or sets the option to log activity
+ * trace of the runbook.
+ * @member {number} [jobCount] Gets or sets the job count of the runbook.
+ * @member {object} [parameters] Gets or sets the runbook parameters.
+ * @member {array} [outputTypes] Gets or sets the runbook output types.
+ * @member {object} [draft] Gets or sets the draft runbook properties.
+ * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
+ * mode.
+ * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
+ * content link.
+ * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
+ * runbook content.
+ * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
+ * the content hash algorithm used to hash the content.
+ * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
+ * expected hash value of the content.
+ * @member {string} [draft.draftContentLink.version] Gets or sets the version
+ * of the content.
+ * @member {date} [draft.creationTime] Gets or sets the creation time of the
+ * runbook draft.
+ * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
+ * of the runbook draft.
+ * @member {object} [draft.parameters] Gets or sets the runbook draft
+ * parameters.
+ * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
+ * @member {string} [provisioningState] Gets or sets the provisioning state of
+ * the runbook. Possible values include: 'Succeeded'
+ * @member {string} [lastModifiedBy] Gets or sets the last modified by.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
+ * @member {string} [etag] Gets or sets the etag of the resource.
  */
-export interface DscConfigurationCreateOrUpdateParameters {
+export interface Runbook extends TrackedResource {
+  runbookType?: string;
+  publishContentLink?: ContentLink;
+  state?: string;
   logVerbose?: boolean;
   logProgress?: boolean;
-  source: ContentSource;
-  parameters?: { [propertyName: string]: DscConfigurationParameter };
+  logActivityTrace?: number;
+  jobCount?: number;
+  parameters?: { [propertyName: string]: RunbookParameter };
+  outputTypes?: string[];
+  draft?: RunbookDraft;
+  provisioningState?: string;
+  lastModifiedBy?: string;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
   description?: string;
-  name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+  etag?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscConfigurationUpdateParameters class.
+ * Initializes a new instance of the RunbookCreateOrUpdateParameters class.
  * @constructor
- * The parameters supplied to the create or update configuration operation.
+ * The parameters supplied to the create or update runbook operation.
  *
  * @member {boolean} [logVerbose] Gets or sets verbose log option.
  * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {object} source Gets or sets the source.
- * @member {object} [source.hash] Gets or sets the hash.
- * @member {string} [source.hash.algorithm] Gets or sets the content hash
- * algorithm used to hash the content.
- * @member {string} [source.hash.value] Gets or sets expected hash value of the
- * content.
- * @member {string} [source.type] Gets or sets the content source type.
- * Possible values include: 'embeddedContent', 'uri'
- * @member {string} [source.value] Gets or sets the value of the content. This
- * is based on the content source type.
- * @member {string} [source.version] Gets or sets the version of the content.
- * @member {object} [parameters] Gets or sets the configuration parameters.
- * @member {string} [description] Gets or sets the description of the
- * configuration.
- * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} runbookType Gets or sets the type of the runbook. Possible
+ * values include: 'Script', 'Graph', 'PowerShellWorkflow', 'PowerShell',
+ * 'GraphPowerShellWorkflow', 'GraphPowerShell'
+ * @member {object} [draft] Gets or sets the draft runbook properties.
+ * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
+ * mode.
+ * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
+ * content link.
+ * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
+ * runbook content.
+ * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
+ * the content hash algorithm used to hash the content.
+ * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
+ * expected hash value of the content.
+ * @member {string} [draft.draftContentLink.version] Gets or sets the version
+ * of the content.
+ * @member {date} [draft.creationTime] Gets or sets the creation time of the
+ * runbook draft.
+ * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
+ * of the runbook draft.
+ * @member {object} [draft.parameters] Gets or sets the runbook draft
+ * parameters.
+ * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
+ * @member {object} [publishContentLink] Gets or sets the published runbook
+ * content link.
+ * @member {string} [publishContentLink.uri] Gets or sets the uri of the
+ * runbook content.
+ * @member {object} [publishContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [publishContentLink.contentHash.algorithm] Gets or sets the
+ * content hash algorithm used to hash the content.
+ * @member {string} [publishContentLink.contentHash.value] Gets or sets
+ * expected hash value of the content.
+ * @member {string} [publishContentLink.version] Gets or sets the version of
+ * the content.
+ * @member {string} [description] Gets or sets the description of the runbook.
+ * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
+ * options of the runbook.
+ * @member {string} [name] Gets or sets the name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
  * @member {object} [tags] Gets or sets the tags attached to the resource.
  */
-export interface DscConfigurationUpdateParameters {
+export interface RunbookCreateOrUpdateParameters {
   logVerbose?: boolean;
   logProgress?: boolean;
-  source: ContentSource;
-  parameters?: { [propertyName: string]: DscConfigurationParameter };
+  runbookType: string;
+  draft?: RunbookDraft;
+  publishContentLink?: ContentLink;
   description?: string;
+  logActivityTrace?: number;
   name?: string;
+  location?: string;
   tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the DscMetaConfiguration class.
+ * Initializes a new instance of the RunbookUpdateParameters class.
  * @constructor
- * Definition of the DSC Meta Configuration.
+ * The parameters supplied to the update runbook operation.
  *
- * @member {number} [configurationModeFrequencyMins] Gets or sets the
- * ConfigurationModeFrequencyMins value of the meta configuration.
- * @member {boolean} [rebootNodeIfNeeded] Gets or sets the RebootNodeIfNeeded
- * value of the meta configuration.
- * @member {string} [configurationMode] Gets or sets the ConfigurationMode
- * value of the meta configuration.
- * @member {string} [actionAfterReboot] Gets or sets the ActionAfterReboot
- * value of the meta configuration.
- * @member {string} [certificateId] Gets or sets the CertificateId value of the
- * meta configuration.
- * @member {number} [refreshFrequencyMins] Gets or sets the
- * RefreshFrequencyMins value of the meta configuration.
- * @member {boolean} [allowModuleOverwrite] Gets or sets the
- * AllowModuleOverwrite value of the meta configuration.
+ * @member {string} [description] Gets or sets the description of the runbook.
+ * @member {boolean} [logVerbose] Gets or sets verbose log option.
+ * @member {boolean} [logProgress] Gets or sets progress log option.
+ * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
+ * options of the runbook.
+ * @member {string} [name] Gets or sets the name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
  */
-export interface DscMetaConfiguration {
-  configurationModeFrequencyMins?: number;
-  rebootNodeIfNeeded?: boolean;
-  configurationMode?: string;
-  actionAfterReboot?: string;
-  certificateId?: string;
-  refreshFrequencyMins?: number;
-  allowModuleOverwrite?: boolean;
+export interface RunbookUpdateParameters {
+  description?: string;
+  logVerbose?: boolean;
+  logProgress?: boolean;
+  logActivityTrace?: number;
+  name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
 }
 
 /**
  * @class
- * Initializes a new instance of the DscNodeConfigurationAssociationProperty class.
+ * Initializes a new instance of the RunbookDraftUndoEditResult class.
  * @constructor
- * The dsc nodeconfiguration property associated with the entity.
+ * The response model for the undoedit runbook operation.
  *
- * @member {string} [name] Gets or sets the name of the dsc nodeconfiguration.
+ * @member {string} [statusCode] Possible values include: 'Continue',
+ * 'SwitchingProtocols', 'OK', 'Created', 'Accepted',
+ * 'NonAuthoritativeInformation', 'NoContent', 'ResetContent',
+ * 'PartialContent', 'MultipleChoices', 'Ambiguous', 'MovedPermanently',
+ * 'Moved', 'Found', 'Redirect', 'SeeOther', 'RedirectMethod', 'NotModified',
+ * 'UseProxy', 'Unused', 'TemporaryRedirect', 'RedirectKeepVerb', 'BadRequest',
+ * 'Unauthorized', 'PaymentRequired', 'Forbidden', 'NotFound',
+ * 'MethodNotAllowed', 'NotAcceptable', 'ProxyAuthenticationRequired',
+ * 'RequestTimeout', 'Conflict', 'Gone', 'LengthRequired',
+ * 'PreconditionFailed', 'RequestEntityTooLarge', 'RequestUriTooLong',
+ * 'UnsupportedMediaType', 'RequestedRangeNotSatisfiable', 'ExpectationFailed',
+ * 'UpgradeRequired', 'InternalServerError', 'NotImplemented', 'BadGateway',
+ * 'ServiceUnavailable', 'GatewayTimeout', 'HttpVersionNotSupported'
+ * @member {string} [requestId]
  */
-export interface DscNodeConfigurationAssociationProperty {
-  name?: string;
+export interface RunbookDraftUndoEditResult {
+  statusCode?: string;
+  requestId?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscNodeExtensionHandlerAssociationProperty class.
+ * Initializes a new instance of the TestJobCreateParameters class.
  * @constructor
- * The dsc extensionHandler property associated with the node
+ * The parameters supplied to the create test job operation.
  *
- * @member {string} [name] Gets or sets the name of the extension handler.
- * @member {string} [version] Gets or sets the version of the extension
- * handler.
+ * @member {object} [parameters] Gets or sets the parameters of the test job.
+ * @member {string} [runOn] Gets or sets the runOn which specifies the group
+ * name where the job is to be executed.
  */
-export interface DscNodeExtensionHandlerAssociationProperty {
-  name?: string;
-  version?: string;
+export interface TestJobCreateParameters {
+  parameters?: { [propertyName: string]: string };
+  runOn?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscNodeUpdateParametersProperties class.
+ * Initializes a new instance of the TestJob class.
  * @constructor
- * @member {string} [name] Gets or sets the name of the dsc nodeconfiguration.
+ * Definition of the test job.
+ *
+ * @member {date} [creationTime] Gets or sets the creation time of the test
+ * job.
+ * @member {string} [status] Gets or sets the status of the test job.
+ * @member {string} [statusDetails] Gets or sets the status details of the test
+ * job.
+ * @member {string} [runOn] Gets or sets the runOn which specifies the group
+ * name where the job is to be executed.
+ * @member {date} [startTime] Gets or sets the start time of the test job.
+ * @member {date} [endTime] Gets or sets the end time of the test job.
+ * @member {string} [exception] Gets or sets the exception of the test job.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
+ * test job.
+ * @member {date} [lastStatusModifiedTime] Gets or sets the last status
+ * modified time of the test job.
+ * @member {object} [parameters] Gets or sets the parameters of the test job.
+ * @member {number} [logActivityTrace] The activity-level tracing options of
+ * the runbook.
  */
-export interface DscNodeUpdateParametersProperties {
-  name?: string;
+export interface TestJob {
+  creationTime?: Date;
+  status?: string;
+  statusDetails?: string;
+  runOn?: string;
+  startTime?: Date;
+  endTime?: Date;
+  exception?: string;
+  lastModifiedTime?: Date;
+  lastStatusModifiedTime?: Date;
+  parameters?: { [propertyName: string]: string };
+  logActivityTrace?: number;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscNodeUpdateParameters class.
+ * Initializes a new instance of the RunbookCreateOrUpdateDraftProperties class.
  * @constructor
- * The parameters supplied to the update dsc node operation.
+ * The parameters supplied to the create or update dratft runbook properties.
  *
- * @member {string} [nodeId] Gets or sets the id of the dsc node.
- * @member {object} [nodeConfiguration] Gets or sets the configuration of the
- * node.
- * @member {string} [nodeConfiguration.name] Gets or sets the name of the dsc
- * nodeconfiguration.
- * @member {object} [properties]
- * @member {string} [properties.name] Gets or sets the name of the dsc
- * nodeconfiguration.
+ * @member {boolean} [logVerbose] Gets or sets verbose log option.
+ * @member {boolean} [logProgress] Gets or sets progress log option.
+ * @member {string} runbookType Gets or sets the type of the runbook. Possible
+ * values include: 'Script', 'Graph', 'PowerShellWorkflow', 'PowerShell',
+ * 'GraphPowerShellWorkflow', 'GraphPowerShell'
+ * @member {object} draft Gets or sets the draft runbook properties.
+ * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
+ * mode.
+ * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
+ * content link.
+ * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
+ * runbook content.
+ * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
+ * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
+ * the content hash algorithm used to hash the content.
+ * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
+ * expected hash value of the content.
+ * @member {string} [draft.draftContentLink.version] Gets or sets the version
+ * of the content.
+ * @member {date} [draft.creationTime] Gets or sets the creation time of the
+ * runbook draft.
+ * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
+ * of the runbook draft.
+ * @member {object} [draft.parameters] Gets or sets the runbook draft
+ * parameters.
+ * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
+ * @member {string} [description] Gets or sets the description of the runbook.
+ * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
+ * options of the runbook.
  */
-export interface DscNodeUpdateParameters {
-  nodeId?: string;
-  nodeConfiguration?: DscNodeConfigurationAssociationProperty;
-  properties?: DscNodeUpdateParametersProperties;
+export interface RunbookCreateOrUpdateDraftProperties {
+  logVerbose?: boolean;
+  logProgress?: boolean;
+  runbookType: string;
+  draft: RunbookDraft;
+  description?: string;
+  logActivityTrace?: number;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscReportError class.
+ * Initializes a new instance of the RunbookCreateOrUpdateDraftParameters class.
  * @constructor
- * Definition of the dsc node report error type.
+ * The parameters supplied to the create or update runbook operation.
  *
- * @member {string} [errorSource] Gets or sets the source of the error.
- * @member {string} [resourceId] Gets or sets the resource ID which generated
- * the error.
- * @member {string} [errorCode] Gets or sets the error code.
- * @member {string} [errorMessage] Gets or sets the error message.
- * @member {string} [locale] Gets or sets the locale of the error.
- * @member {string} [errorDetails] Gets or sets the error details.
+ * @member {string} runbookContent Content of the Runbook.
  */
-export interface DscReportError {
-  errorSource?: string;
-  resourceId?: string;
-  errorCode?: string;
-  errorMessage?: string;
-  locale?: string;
-  errorDetails?: string;
+export interface RunbookCreateOrUpdateDraftParameters {
+  runbookContent: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscReportResourceNavigation class.
+ * Initializes a new instance of the AdvancedScheduleMonthlyOccurrence class.
  * @constructor
- * Navigation for DSC Report Resource.
+ * The properties of the create advanced schedule monthly occurrence.
  *
- * @member {string} [resourceId] Gets or sets the ID of the resource to
- * navigate to.
+ * @member {number} [occurrence] Occurrence of the week within the month. Must
+ * be between 1 and 5
+ * @member {string} [day] Day of the occurrence. Must be one of monday,
+ * tuesday, wednesday, thursday, friday, saturday, sunday. Possible values
+ * include: 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday',
+ * 'Sunday'
  */
-export interface DscReportResourceNavigation {
-  resourceId?: string;
+export interface AdvancedScheduleMonthlyOccurrence {
+  occurrence?: number;
+  day?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the DscReportResource class.
+ * Initializes a new instance of the AdvancedSchedule class.
  * @constructor
- * Definition of the DSC Report Resource.
+ * The properties of the create Advanced Schedule.
  *
- * @member {string} [resourceId] Gets or sets the ID of the resource.
- * @member {string} [sourceInfo] Gets or sets the source info of the resource.
- * @member {array} [dependsOn] Gets or sets the Resource Navigation values for
- * resources the resource depends on.
- * @member {string} [moduleName] Gets or sets the module name of the resource.
- * @member {string} [moduleVersion] Gets or sets the module version of the
- * resource.
- * @member {string} [resourceName] Gets or sets the name of the resource.
- * @member {string} [error] Gets or sets the error of the resource.
- * @member {string} [status] Gets or sets the status of the resource.
- * @member {number} [durationInSeconds] Gets or sets the duration in seconds
- * for the resource.
- * @member {date} [startDate] Gets or sets the start date of the resource.
+ * @member {array} [weekDays] Days of the week that the job should execute on.
+ * @member {array} [monthDays] Days of the month that the job should execute
+ * on. Must be between 1 and 31.
+ * @member {array} [monthlyOccurrences] Occurrences of days within a month.
  */
-export interface DscReportResource {
-  resourceId?: string;
-  sourceInfo?: string;
-  dependsOn?: DscReportResourceNavigation[];
-  moduleName?: string;
-  moduleVersion?: string;
-  resourceName?: string;
-  error?: string;
-  status?: string;
-  durationInSeconds?: number;
-  startDate?: Date;
+export interface AdvancedSchedule {
+  weekDays?: string[];
+  monthDays?: number[];
+  monthlyOccurrences?: AdvancedScheduleMonthlyOccurrence[];
 }
 
 /**
  * @class
- * Initializes a new instance of the DscNodeReport class.
+ * Initializes a new instance of the ScheduleCreateOrUpdateParameters class.
  * @constructor
- * Definition of the dsc node report type.
+ * The parameters supplied to the create or update schedule operation.
  *
- * @member {date} [endTime] Gets or sets the end time of the node report.
- * @member {date} [lastModifiedTime] Gets or sets the lastModifiedTime of the
- * node report.
- * @member {date} [startTime] Gets or sets the start time of the node report.
- * @member {string} [type] Gets or sets the type of the node report.
- * @member {string} [reportId] Gets or sets the id of the node report.
- * @member {string} [status] Gets or sets the status of the node report.
- * @member {string} [refreshMode] Gets or sets the refreshMode of the node
- * report.
- * @member {string} [rebootRequested] Gets or sets the rebootRequested of the
- * node report.
- * @member {string} [reportFormatVersion] Gets or sets the reportFormatVersion
- * of the node report.
- * @member {string} [configurationVersion] Gets or sets the
- * configurationVersion of the node report.
- * @member {string} [id] Gets or sets the id.
- * @member {array} [errors] Gets or sets the errors for the node report.
- * @member {array} [resources] Gets or sets the resource for the node report.
- * @member {object} [metaConfiguration] Gets or sets the metaConfiguration of
- * the node at the time of the report.
- * @member {number} [metaConfiguration.configurationModeFrequencyMins] Gets or
- * sets the ConfigurationModeFrequencyMins value of the meta configuration.
- * @member {boolean} [metaConfiguration.rebootNodeIfNeeded] Gets or sets the
- * RebootNodeIfNeeded value of the meta configuration.
- * @member {string} [metaConfiguration.configurationMode] Gets or sets the
- * ConfigurationMode value of the meta configuration.
- * @member {string} [metaConfiguration.actionAfterReboot] Gets or sets the
- * ActionAfterReboot value of the meta configuration.
- * @member {string} [metaConfiguration.certificateId] Gets or sets the
- * CertificateId value of the meta configuration.
- * @member {number} [metaConfiguration.refreshFrequencyMins] Gets or sets the
- * RefreshFrequencyMins value of the meta configuration.
- * @member {boolean} [metaConfiguration.allowModuleOverwrite] Gets or sets the
- * AllowModuleOverwrite value of the meta configuration.
- * @member {string} [hostName] Gets or sets the hostname of the node that sent
- * the report.
- * @member {array} [iPV4Addresses] Gets or sets the IPv4 address of the node
- * that sent the report.
- * @member {array} [iPV6Addresses] Gets or sets the IPv6 address of the node
- * that sent the report.
- * @member {number} [numberOfResources] Gets or sets the number of resource in
- * the node report.
- * @member {string} [rawErrors] Gets or sets the unparsed errors for the node
- * report.
+ * @member {string} name Gets or sets the name of the Schedule.
+ * @member {string} [description] Gets or sets the description of the schedule.
+ * @member {date} startTime Gets or sets the start time of the schedule.
+ * @member {date} [expiryTime] Gets or sets the end time of the schedule.
+ * @member {object} [interval] Gets or sets the interval of the schedule.
+ * @member {string} frequency Possible values include: 'OneTime', 'Day',
+ * 'Hour', 'Week', 'Month'
+ * @member {string} [timeZone] Gets or sets the time zone of the schedule.
+ * @member {object} [advancedSchedule] Gets or sets the AdvancedSchedule.
+ * @member {array} [advancedSchedule.weekDays] Days of the week that the job
+ * should execute on.
+ * @member {array} [advancedSchedule.monthDays] Days of the month that the job
+ * should execute on. Must be between 1 and 31.
+ * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
+ * within a month.
  */
-export interface DscNodeReport {
-  endTime?: Date;
-  lastModifiedTime?: Date;
-  startTime?: Date;
-  type?: string;
-  reportId?: string;
-  status?: string;
-  refreshMode?: string;
-  rebootRequested?: string;
-  reportFormatVersion?: string;
-  configurationVersion?: string;
-  id?: string;
-  errors?: DscReportError[];
-  resources?: DscReportResource[];
-  metaConfiguration?: DscMetaConfiguration;
-  hostName?: string;
-  iPV4Addresses?: string[];
-  iPV6Addresses?: string[];
-  numberOfResources?: number;
-  rawErrors?: string;
+export interface ScheduleCreateOrUpdateParameters {
+  name: string;
+  description?: string;
+  startTime: Date;
+  expiryTime?: Date;
+  interval?: any;
+  frequency: string;
+  timeZone?: string;
+  advancedSchedule?: AdvancedSchedule;
 }
 
 /**
  * @class
- * Initializes a new instance of the HybridRunbookWorker class.
+ * Initializes a new instance of the ScheduleProperties class.
  * @constructor
- * Definition of hybrid runbook worker.
+ * Definition of schedule parameters.
  *
- * @member {string} [name] Gets or sets the worker machine name.
- * @member {string} [ip] Gets or sets the assigned machine IP address.
- * @member {date} [registrationTime] Gets or sets the registration time of the
- * worker machine.
- * @member {date} [lastSeenDateTime] Last Heartbeat from the Worker
+ * @member {date} [startTime] Gets or sets the start time of the schedule.
+ * @member {number} [startTimeOffsetMinutes] Gets the start time's offset in
+ * minutes.
+ * @member {date} [expiryTime] Gets or sets the end time of the schedule.
+ * @member {number} [expiryTimeOffsetMinutes] Gets or sets the expiry time's
+ * offset in minutes.
+ * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
+ * schedule is enabled. Default value: false .
+ * @member {date} [nextRun] Gets or sets the next run time of the schedule.
+ * @member {number} [nextRunOffsetMinutes] Gets or sets the next run time's
+ * offset in minutes.
+ * @member {number} [interval] Gets or sets the interval of the schedule.
+ * @member {string} [frequency] Gets or sets the frequency of the schedule.
+ * Possible values include: 'OneTime', 'Day', 'Hour', 'Week', 'Month'
+ * @member {string} [timeZone] Gets or sets the time zone of the schedule.
+ * @member {object} [advancedSchedule] Gets or sets the advanced schedule.
+ * @member {array} [advancedSchedule.weekDays] Days of the week that the job
+ * should execute on.
+ * @member {array} [advancedSchedule.monthDays] Days of the month that the job
+ * should execute on. Must be between 1 and 31.
+ * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
+ * within a month.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
  */
-export interface HybridRunbookWorker {
-  name?: string;
-  ip?: string;
-  registrationTime?: Date;
-  lastSeenDateTime?: Date;
+export interface ScheduleProperties {
+  startTime?: Date;
+  readonly startTimeOffsetMinutes?: number;
+  expiryTime?: Date;
+  expiryTimeOffsetMinutes?: number;
+  isEnabled?: boolean;
+  nextRun?: Date;
+  nextRunOffsetMinutes?: number;
+  interval?: number;
+  frequency?: string;
+  timeZone?: string;
+  advancedSchedule?: AdvancedSchedule;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the RunAsCredentialAssociationProperty class.
+ * Initializes a new instance of the Schedule class.
  * @constructor
- * Definition of runas credential to use for hybrid worker.
+ * Definition of the schedule.
  *
- * @member {string} [name] Gets or sets the name of the credential.
+ * @member {date} [startTime] Gets or sets the start time of the schedule.
+ * @member {number} [startTimeOffsetMinutes] Gets the start time's offset in
+ * minutes.
+ * @member {date} [expiryTime] Gets or sets the end time of the schedule.
+ * @member {number} [expiryTimeOffsetMinutes] Gets or sets the expiry time's
+ * offset in minutes.
+ * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
+ * schedule is enabled. Default value: false .
+ * @member {date} [nextRun] Gets or sets the next run time of the schedule.
+ * @member {number} [nextRunOffsetMinutes] Gets or sets the next run time's
+ * offset in minutes.
+ * @member {number} [interval] Gets or sets the interval of the schedule.
+ * @member {string} [frequency] Gets or sets the frequency of the schedule.
+ * Possible values include: 'OneTime', 'Day', 'Hour', 'Week', 'Month'
+ * @member {string} [timeZone] Gets or sets the time zone of the schedule.
+ * @member {object} [advancedSchedule] Gets or sets the advanced schedule.
+ * @member {array} [advancedSchedule.weekDays] Days of the week that the job
+ * should execute on.
+ * @member {array} [advancedSchedule.monthDays] Days of the month that the job
+ * should execute on. Must be between 1 and 31.
+ * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
+ * within a month.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
  */
-export interface RunAsCredentialAssociationProperty {
-  name?: string;
+export interface Schedule extends ProxyResource {
+  startTime?: Date;
+  readonly startTimeOffsetMinutes?: number;
+  expiryTime?: Date;
+  expiryTimeOffsetMinutes?: number;
+  isEnabled?: boolean;
+  nextRun?: Date;
+  nextRunOffsetMinutes?: number;
+  interval?: number;
+  frequency?: string;
+  timeZone?: string;
+  advancedSchedule?: AdvancedSchedule;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the HybridRunbookWorkerGroup class.
+ * Initializes a new instance of the ScheduleUpdateParameters class.
  * @constructor
- * Definition of hybrid runbook worker group.
+ * The parameters supplied to the update schedule operation.
  *
- * @member {string} [id] Gets or sets the id of the resource.
- * @member {string} [name] Gets or sets the name of the group.
- * @member {array} [hybridRunbookWorkers] Gets or sets the list of hybrid
- * runbook workers.
- * @member {object} [credential] Sets the credential of a worker group.
- * @member {string} [credential.name] Gets or sets the name of the credential.
- * @member {string} [groupType] Type of the HybridWorkerGroup. Possible values
- * include: 'User', 'System'
+ * @member {string} [name] Gets or sets the name of the Schedule.
+ * @member {string} [description] Gets or sets the description of the schedule.
+ * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
+ * schedule is enabled.
  */
-export interface HybridRunbookWorkerGroup {
-  id?: string;
+export interface ScheduleUpdateParameters {
   name?: string;
-  hybridRunbookWorkers?: HybridRunbookWorker[];
-  credential?: RunAsCredentialAssociationProperty;
-  groupType?: string;
+  description?: string;
+  isEnabled?: boolean;
 }
 
 /**
  * @class
- * Initializes a new instance of the HybridRunbookWorkerGroupUpdateParameters class.
+ * Initializes a new instance of the VariableCreateOrUpdateParameters class.
  * @constructor
- * Parameters supplied to the update operation.
+ * The parameters supplied to the create or update variable operation.
  *
- * @member {object} [credential] Sets the credential of a worker group.
- * @member {string} [credential.name] Gets or sets the name of the credential.
+ * @member {string} name Gets or sets the name of the variable.
+ * @member {string} [value] Gets or sets the value of the variable.
+ * @member {string} [description] Gets or sets the description of the variable.
+ * @member {boolean} [isEncrypted] Gets or sets the encrypted flag of the
+ * variable.
  */
-export interface HybridRunbookWorkerGroupUpdateParameters {
-  credential?: RunAsCredentialAssociationProperty;
+export interface VariableCreateOrUpdateParameters {
+  name: string;
+  value?: string;
+  description?: string;
+  isEncrypted?: boolean;
 }
 
 /**
  * @class
- * Initializes a new instance of the ScheduleAssociationProperty class.
+ * Initializes a new instance of the Variable class.
  * @constructor
- * The schedule property associated with the entity.
+ * Definition of the varible.
  *
- * @member {string} [name] Gets or sets the name of the schedule.
+ * @member {string} [value] Gets or sets the value of the variable.
+ * @member {boolean} [isEncrypted] Gets or sets the encrypted flag of the
+ * variable.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [description] Gets or sets the description.
  */
-export interface ScheduleAssociationProperty {
-  name?: string;
+export interface Variable extends ProxyResource {
+  value?: string;
+  isEncrypted?: boolean;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the JobScheduleCreateParameters class.
+ * Initializes a new instance of the VariableUpdateParameters class.
  * @constructor
- * The parameters supplied to the create job schedule operation.
+ * The parameters supplied to the update variable operation.
  *
- * @member {object} schedule Gets or sets the schedule.
- * @member {string} [schedule.name] Gets or sets the name of the schedule.
- * @member {object} runbook Gets or sets the runbook.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {string} [runOn] Gets or sets the hybrid worker group that the
- * scheduled job should run on.
- * @member {object} [parameters] Gets or sets a list of job properties.
+ * @member {string} [name] Gets or sets the name of the variable.
+ * @member {string} [value] Gets or sets the value of the variable.
+ * @member {string} [description] Gets or sets the description of the variable.
  */
-export interface JobScheduleCreateParameters {
-  schedule: ScheduleAssociationProperty;
-  runbook: RunbookAssociationProperty;
-  runOn?: string;
-  parameters?: { [propertyName: string]: string };
+export interface VariableUpdateParameters {
+  name?: string;
+  value?: string;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the JobSchedule class.
+ * Initializes a new instance of the Webhook class.
  * @constructor
- * Definition of the job schedule.
+ * Definition of the webhook type.
  *
- * @member {string} [id] Gets the id of the resource.
- * @member {string} [name] Gets the name of the variable.
- * @member {string} [type] Resource type
- * @member {string} [jobScheduleId] Gets or sets the id of job schedule.
- * @member {object} [schedule] Gets or sets the schedule.
- * @member {string} [schedule.name] Gets or sets the name of the schedule.
- * @member {object} [runbook] Gets or sets the runbook.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {string} [runOn] Gets or sets the hybrid worker group that the
- * scheduled job should run on.
- * @member {object} [parameters] Gets or sets the parameters of the job
- * schedule.
+ * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
+ * the webhook. Default value: false .
+ * @member {string} [uri] Gets or sets the webhook uri.
+ * @member {date} [expiryTime] Gets or sets the expiry time.
+ * @member {date} [lastInvokedTime] Gets or sets the last invoked time.
+ * @member {object} [parameters] Gets or sets the parameters of the job that is
+ * created when the webhook calls the runbook it is associated with.
+ * @member {object} [runbook] Gets or sets the runbook the webhook is
+ * associated with.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {string} [runOn] Gets or sets the name of the hybrid worker group
+ * the webhook job will run on.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [lastModifiedBy] Details of the user who last modified the
+ * Webhook
+ * @member {string} [description] Gets or sets the description.
  */
-export interface JobSchedule {
-  readonly id?: string;
-  readonly name?: string;
-  readonly type?: string;
-  jobScheduleId?: string;
-  schedule?: ScheduleAssociationProperty;
+export interface Webhook extends ProxyResource {
+  isEnabled?: boolean;
+  uri?: string;
+  expiryTime?: Date;
+  lastInvokedTime?: Date;
+  parameters?: { [propertyName: string]: string };
   runbook?: RunbookAssociationProperty;
   runOn?: string;
-  parameters?: { [propertyName: string]: string };
-}
-
-/**
- * @class
- * Initializes a new instance of the LinkedWorkspace class.
- * @constructor
- * Definition of the linked workspace.
- *
- * @member {string} [id] Gets the id of the linked workspace.
- */
-export interface LinkedWorkspace {
-  readonly id?: string;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+  lastModifiedBy?: string;
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ModuleCreateOrUpdateParameters class.
+ * Initializes a new instance of the WebhookUpdateParameters class.
  * @constructor
- * The parameters supplied to the create or update module operation.
+ * The parameters supplied to the update webhook operation.
  *
- * @member {object} contentLink Gets or sets the module content link.
- * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
- * content.
- * @member {object} [contentLink.contentHash] Gets or sets the hash.
- * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
- * value of the content.
- * @member {string} [contentLink.version] Gets or sets the version of the
- * content.
- * @member {string} [name] Gets or sets name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {string} [name] Gets or sets the name of the webhook.
+ * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
+ * webhook.
+ * @member {string} [runOn] Gets or sets the name of the hybrid worker group
+ * the webhook job will run on.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {string} [description] Gets or sets the description of the webhook.
  */
-export interface ModuleCreateOrUpdateParameters {
-  contentLink: ContentLink;
+export interface WebhookUpdateParameters {
   name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+  isEnabled?: boolean;
+  runOn?: string;
+  parameters?: { [propertyName: string]: string };
+  description?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the ModuleUpdateParameters class.
+ * Initializes a new instance of the WebhookCreateOrUpdateParameters class.
  * @constructor
- * The parameters supplied to the update module operation.
+ * The parameters supplied to the create or update webhook operation.
  *
- * @member {object} [contentLink] Gets or sets the module content link.
- * @member {string} [contentLink.uri] Gets or sets the uri of the runbook
- * content.
- * @member {object} [contentLink.contentHash] Gets or sets the hash.
- * @member {string} [contentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [contentLink.contentHash.value] Gets or sets expected hash
- * value of the content.
- * @member {string} [contentLink.version] Gets or sets the version of the
- * content.
- * @member {string} [name] Gets or sets name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {string} name Gets or sets the name of the webhook.
+ * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
+ * webhook.
+ * @member {string} [uri] Gets or sets the uri.
+ * @member {date} [expiryTime] Gets or sets the expiry time.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {object} [runbook] Gets or sets the runbook.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {string} [runOn] Gets or sets the name of the hybrid worker group
+ * the webhook job will run on.
  */
-export interface ModuleUpdateParameters {
-  contentLink?: ContentLink;
-  name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+export interface WebhookCreateOrUpdateParameters {
+  name: string;
+  isEnabled?: boolean;
+  uri?: string;
+  expiryTime?: Date;
+  parameters?: { [propertyName: string]: string };
+  runbook?: RunbookAssociationProperty;
+  runOn?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookDraftUndoEditResult class.
+ * Initializes a new instance of the WindowsProperties class.
  * @constructor
- * The response model for the undoedit runbook operation.
+ * Windows specific update configuration.
  *
- * @member {string} [statusCode] Possible values include: 'Continue',
- * 'SwitchingProtocols', 'OK', 'Created', 'Accepted',
- * 'NonAuthoritativeInformation', 'NoContent', 'ResetContent',
- * 'PartialContent', 'MultipleChoices', 'Ambiguous', 'MovedPermanently',
- * 'Moved', 'Found', 'Redirect', 'SeeOther', 'RedirectMethod', 'NotModified',
- * 'UseProxy', 'Unused', 'TemporaryRedirect', 'RedirectKeepVerb', 'BadRequest',
- * 'Unauthorized', 'PaymentRequired', 'Forbidden', 'NotFound',
- * 'MethodNotAllowed', 'NotAcceptable', 'ProxyAuthenticationRequired',
- * 'RequestTimeout', 'Conflict', 'Gone', 'LengthRequired',
- * 'PreconditionFailed', 'RequestEntityTooLarge', 'RequestUriTooLong',
- * 'UnsupportedMediaType', 'RequestedRangeNotSatisfiable', 'ExpectationFailed',
- * 'UpgradeRequired', 'InternalServerError', 'NotImplemented', 'BadGateway',
- * 'ServiceUnavailable', 'GatewayTimeout', 'HttpVersionNotSupported'
- * @member {string} [requestId]
+ * @member {string} [includedUpdateClassifications] Update classification
+ * included in the software update configuration. A comma separated string with
+ * required values. Possible values include: 'Unclassified', 'Critical',
+ * 'Security', 'UpdateRollup', 'FeaturePack', 'ServicePack', 'Definition',
+ * 'Tools', 'Updates'
+ * @member {array} [excludedKbNumbers] KB numbers excluded from the software
+ * update configuration.
+ * @member {array} [includedKbNumbers] KB numbers included from the software
+ * update configuration.
+ * @member {string} [rebootSetting] Reboot setting for the software update
+ * configuration.
  */
-export interface RunbookDraftUndoEditResult {
-  statusCode?: string;
-  requestId?: string;
+export interface WindowsProperties {
+  includedUpdateClassifications?: string;
+  excludedKbNumbers?: string[];
+  includedKbNumbers?: string[];
+  rebootSetting?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookCreateOrUpdateParameters class.
+ * Initializes a new instance of the LinuxProperties class.
  * @constructor
- * The parameters supplied to the create or update runbook operation.
+ * Linux specific update configuration.
  *
- * @member {boolean} [logVerbose] Gets or sets verbose log option.
- * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {string} runbookType Gets or sets the type of the runbook. Possible
- * values include: 'Script', 'Graph', 'PowerShellWorkflow', 'PowerShell',
- * 'GraphPowerShellWorkflow', 'GraphPowerShell'
- * @member {object} [draft] Gets or sets the draft runbook properties.
- * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
- * mode.
- * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
- * content link.
- * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
- * runbook content.
- * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
- * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
- * the content hash algorithm used to hash the content.
- * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
- * expected hash value of the content.
- * @member {string} [draft.draftContentLink.version] Gets or sets the version
- * of the content.
- * @member {date} [draft.creationTime] Gets or sets the creation time of the
- * runbook draft.
- * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
- * of the runbook draft.
- * @member {object} [draft.parameters] Gets or sets the runbook draft
- * parameters.
- * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
- * @member {object} [publishContentLink] Gets or sets the published runbook
- * content link.
- * @member {string} [publishContentLink.uri] Gets or sets the uri of the
- * runbook content.
- * @member {object} [publishContentLink.contentHash] Gets or sets the hash.
- * @member {string} [publishContentLink.contentHash.algorithm] Gets or sets the
- * content hash algorithm used to hash the content.
- * @member {string} [publishContentLink.contentHash.value] Gets or sets
- * expected hash value of the content.
- * @member {string} [publishContentLink.version] Gets or sets the version of
- * the content.
- * @member {string} [description] Gets or sets the description of the runbook.
- * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
- * options of the runbook.
- * @member {string} [name] Gets or sets the name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
+ * @member {string} [includedPackageClassifications] Update classifications
+ * included in the software update configuration. Possible values include:
+ * 'Unclassified', 'Critical', 'Security', 'Other'
+ * @member {array} [excludedPackageNameMasks] packages excluded from the
+ * software update configuration.
+ * @member {array} [includedPackageNameMasks] packages included from the
+ * software update configuration.
+ * @member {string} [rebootSetting] Reboot setting for the software update
+ * configuration.
  */
-export interface RunbookCreateOrUpdateParameters {
-  logVerbose?: boolean;
-  logProgress?: boolean;
-  runbookType: string;
-  draft?: RunbookDraft;
-  publishContentLink?: ContentLink;
-  description?: string;
-  logActivityTrace?: number;
-  name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
+export interface LinuxProperties {
+  includedPackageClassifications?: string;
+  excludedPackageNameMasks?: string[];
+  includedPackageNameMasks?: string[];
+  rebootSetting?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the RunbookCreateOrUpdateDraftProperties class.
+ * Initializes a new instance of the UpdateConfiguration class.
  * @constructor
- * The parameters supplied to the create or update dratft runbook properties.
- *
- * @member {boolean} [logVerbose] Gets or sets verbose log option.
- * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {string} runbookType Gets or sets the type of the runbook. Possible
- * values include: 'Script', 'Graph', 'PowerShellWorkflow', 'PowerShell',
- * 'GraphPowerShellWorkflow', 'GraphPowerShell'
- * @member {object} draft Gets or sets the draft runbook properties.
- * @member {boolean} [draft.inEdit] Gets or sets whether runbook is in edit
- * mode.
- * @member {object} [draft.draftContentLink] Gets or sets the draft runbook
- * content link.
- * @member {string} [draft.draftContentLink.uri] Gets or sets the uri of the
- * runbook content.
- * @member {object} [draft.draftContentLink.contentHash] Gets or sets the hash.
- * @member {string} [draft.draftContentLink.contentHash.algorithm] Gets or sets
- * the content hash algorithm used to hash the content.
- * @member {string} [draft.draftContentLink.contentHash.value] Gets or sets
- * expected hash value of the content.
- * @member {string} [draft.draftContentLink.version] Gets or sets the version
- * of the content.
- * @member {date} [draft.creationTime] Gets or sets the creation time of the
- * runbook draft.
- * @member {date} [draft.lastModifiedTime] Gets or sets the last modified time
- * of the runbook draft.
- * @member {object} [draft.parameters] Gets or sets the runbook draft
- * parameters.
- * @member {array} [draft.outputTypes] Gets or sets the runbook output types.
- * @member {string} [description] Gets or sets the description of the runbook.
- * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
- * options of the runbook.
- */
-export interface RunbookCreateOrUpdateDraftProperties {
-  logVerbose?: boolean;
-  logProgress?: boolean;
-  runbookType: string;
-  draft: RunbookDraft;
-  description?: string;
-  logActivityTrace?: number;
-}
-
-/**
- * @class
- * Initializes a new instance of the RunbookCreateOrUpdateDraftParameters class.
- * @constructor
- * The parameters supplied to the create or update runbook operation.
- *
- * @member {string} runbookContent Content of the Runbook.
- */
-export interface RunbookCreateOrUpdateDraftParameters {
-  runbookContent: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the RunbookUpdateParameters class.
- * @constructor
- * The parameters supplied to the update runbook operation.
- *
- * @member {string} [description] Gets or sets the description of the runbook.
- * @member {boolean} [logVerbose] Gets or sets verbose log option.
- * @member {boolean} [logProgress] Gets or sets progress log option.
- * @member {number} [logActivityTrace] Gets or sets the activity-level tracing
- * options of the runbook.
- * @member {string} [name] Gets or sets the name of the resource.
- * @member {string} [location] Gets or sets the location of the resource.
- * @member {object} [tags] Gets or sets the tags attached to the resource.
- */
-export interface RunbookUpdateParameters {
-  description?: string;
-  logVerbose?: boolean;
-  logProgress?: boolean;
-  logActivityTrace?: number;
-  name?: string;
-  location?: string;
-  tags?: { [propertyName: string]: string };
-}
-
-/**
- * @class
- * Initializes a new instance of the ScheduleCreateOrUpdateParameters class.
- * @constructor
- * The parameters supplied to the create or update schedule operation.
- *
- * @member {string} name Gets or sets the name of the schedule.
- * @member {string} [description] Gets or sets the description of the schedule.
- * @member {date} startTime Gets or sets the start time of the schedule.
- * @member {date} [expiryTime] Gets or sets the end time of the schedule.
- * @member {object} [interval] Gets or sets the interval of the schedule.
- * @member {string} frequency Possible values include: 'OneTime', 'Day',
- * 'Hour', 'Week', 'Month'
- * @member {string} [timeZone] Gets or sets the time zone of the schedule.
- * @member {object} [advancedSchedule] Gets or sets the AdvancedSchedule.
- * @member {array} [advancedSchedule.weekDays] Days of the week that the job
- * should execute on.
- * @member {array} [advancedSchedule.monthDays] Days of the month that the job
- * should execute on. Must be between 1 and 31.
- * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
- * within a month.
- */
-export interface ScheduleCreateOrUpdateParameters {
-  name: string;
-  description?: string;
-  startTime: Date;
-  expiryTime?: Date;
-  interval?: any;
-  frequency: string;
-  timeZone?: string;
-  advancedSchedule?: AdvancedSchedule;
-}
-
-/**
- * @class
- * Initializes a new instance of the ScheduleProperties class.
- * @constructor
- * Definition of schedule parameters.
- *
- * @member {date} [startTime] Gets or sets the start time of the schedule.
- * @member {number} [startTimeOffsetMinutes] Gets the start time's offset in
- * minutes.
- * @member {date} [expiryTime] Gets or sets the end time of the schedule.
- * @member {number} [expiryTimeOffsetMinutes] Gets or sets the expiry time's
- * offset in minutes.
- * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
- * schedule is enabled. Default value: false .
- * @member {date} [nextRun] Gets or sets the next run time of the schedule.
- * @member {number} [nextRunOffsetMinutes] Gets or sets the next run time's
- * offset in minutes.
- * @member {number} [interval] Gets or sets the interval of the schedule.
- * @member {string} [frequency] Gets or sets the frequency of the schedule.
- * Possible values include: 'OneTime', 'Day', 'Hour', 'Week', 'Month'
- * @member {string} [timeZone] Gets or sets the time zone of the schedule.
- * @member {object} [advancedSchedule] Gets or sets the advanced schedule.
- * @member {array} [advancedSchedule.weekDays] Days of the week that the job
- * should execute on.
- * @member {array} [advancedSchedule.monthDays] Days of the month that the job
- * should execute on. Must be between 1 and 31.
- * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
- * within a month.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [description] Gets or sets the description.
- */
-export interface ScheduleProperties {
-  startTime?: Date;
-  readonly startTimeOffsetMinutes?: number;
-  expiryTime?: Date;
-  expiryTimeOffsetMinutes?: number;
-  isEnabled?: boolean;
-  nextRun?: Date;
-  nextRunOffsetMinutes?: number;
-  interval?: number;
-  frequency?: string;
-  timeZone?: string;
-  advancedSchedule?: AdvancedSchedule;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the Schedule class.
- * @constructor
- * Definition of the schedule.
- *
- * @member {string} [id] Gets the id of the resource.
- * @member {string} [name] Gets name of the schedule.
- * @member {string} [type] Resource type
- * @member {date} [startTime] Gets or sets the start time of the schedule.
- * @member {number} [startTimeOffsetMinutes] Gets the start time's offset in
- * minutes.
- * @member {date} [expiryTime] Gets or sets the end time of the schedule.
- * @member {number} [expiryTimeOffsetMinutes] Gets or sets the expiry time's
- * offset in minutes.
- * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
- * schedule is enabled. Default value: false .
- * @member {date} [nextRun] Gets or sets the next run time of the schedule.
- * @member {number} [nextRunOffsetMinutes] Gets or sets the next run time's
- * offset in minutes.
- * @member {number} [interval] Gets or sets the interval of the schedule.
- * @member {string} [frequency] Gets or sets the frequency of the schedule.
- * Possible values include: 'OneTime', 'Day', 'Hour', 'Week', 'Month'
- * @member {string} [timeZone] Gets or sets the time zone of the schedule.
- * @member {object} [advancedSchedule] Gets or sets the advanced schedule.
- * @member {array} [advancedSchedule.weekDays] Days of the week that the job
- * should execute on.
- * @member {array} [advancedSchedule.monthDays] Days of the month that the job
- * should execute on. Must be between 1 and 31.
- * @member {array} [advancedSchedule.monthlyOccurrences] Occurrences of days
- * within a month.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
- * @member {string} [description] Gets or sets the description.
- */
-export interface Schedule {
-  readonly id?: string;
-  readonly name?: string;
-  readonly type?: string;
-  startTime?: Date;
-  readonly startTimeOffsetMinutes?: number;
-  expiryTime?: Date;
-  expiryTimeOffsetMinutes?: number;
-  isEnabled?: boolean;
-  nextRun?: Date;
-  nextRunOffsetMinutes?: number;
-  interval?: number;
-  frequency?: string;
-  timeZone?: string;
-  advancedSchedule?: AdvancedSchedule;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the ScheduleUpdateParameters class.
- * @constructor
- * The parameters supplied to the update schedule operation.
- *
- * @member {string} [name] Gets or sets the name of the schedule.
- * @member {string} [description] Gets or sets the description of the schedule.
- * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
- * schedule is enabled.
- */
-export interface ScheduleUpdateParameters {
-  name?: string;
-  description?: string;
-  isEnabled?: boolean;
-}
-
-/**
- * @class
- * Initializes a new instance of the SubResource class.
- * @constructor
- * The Sub Resource definition.
- *
- * @member {string} [id] Resource Id
- */
-export interface SubResource extends BaseResource {
-  id?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the TestJobCreateParameters class.
- * @constructor
- * The parameters supplied to the create test job operation.
- *
- * @member {object} [parameters] Gets or sets the parameters of the test job.
- * @member {string} [runOn] Gets or sets the runOn which specifies the group
- * name where the job is to be executed.
- */
-export interface TestJobCreateParameters {
-  parameters?: { [propertyName: string]: string };
-  runOn?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the TestJob class.
- * @constructor
- * Definition of the test job.
- *
- * @member {date} [creationTime] Gets or sets the creation time of the test
- * job.
- * @member {string} [status] Gets or sets the status of the test job.
- * @member {string} [statusDetails] Gets or sets the status details of the test
- * job.
- * @member {string} [runOn] Gets or sets the runOn which specifies the group
- * name where the job is to be executed.
- * @member {date} [startTime] Gets or sets the start time of the test job.
- * @member {date} [endTime] Gets or sets the end time of the test job.
- * @member {string} [exception] Gets or sets the exception of the test job.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
- * test job.
- * @member {date} [lastStatusModifiedTime] Gets or sets the last status
- * modified time of the test job.
- * @member {object} [parameters] Gets or sets the parameters of the test job.
- * @member {number} [logActivityTrace] The activity-level tracing options of
- * the runbook.
- */
-export interface TestJob {
-  creationTime?: Date;
-  status?: string;
-  statusDetails?: string;
-  runOn?: string;
-  startTime?: Date;
-  endTime?: Date;
-  exception?: string;
-  lastModifiedTime?: Date;
-  lastStatusModifiedTime?: Date;
-  parameters?: { [propertyName: string]: string };
-  logActivityTrace?: number;
-}
-
-/**
- * @class
- * Initializes a new instance of the TypeField class.
- * @constructor
- * Information about a field of a type.
- *
- * @member {string} [name] Gets or sets the name of the field.
- * @member {string} [type] Gets or sets the type of the field.
- */
-export interface TypeField {
-  name?: string;
-  type?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the VariableCreateOrUpdateParameters class.
- * @constructor
- * The parameters supplied to the create or update variable operation.
- *
- * @member {string} name Gets or sets the name of the variable.
- * @member {string} [value] Gets or sets the value of the variable.
- * @member {string} [description] Gets or sets the description of the variable.
- * @member {boolean} [isEncrypted] Gets or sets the encrypted flag of the
- * variable.
- */
-export interface VariableCreateOrUpdateParameters {
-  name: string;
-  value?: string;
-  description?: string;
-  isEncrypted?: boolean;
-}
-
-/**
- * @class
- * Initializes a new instance of the VariableUpdateParameters class.
- * @constructor
- * The parameters supplied to the update variable operation.
- *
- * @member {string} [name] Gets or sets the name of the variable.
- * @member {string} [value] Gets or sets the value of the variable.
- * @member {string} [description] Gets or sets the description of the variable.
- */
-export interface VariableUpdateParameters {
-  name?: string;
-  value?: string;
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the WebhookCreateOrUpdateParameters class.
- * @constructor
- * The parameters supplied to the create or update webhook operation.
- *
- * @member {string} name Gets or sets the name of the webhook.
- * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
- * webhook.
- * @member {string} [uri] Gets or sets the uri.
- * @member {date} [expiryTime] Gets or sets the expiry time.
- * @member {object} [parameters] Gets or sets the parameters of the job.
- * @member {object} [runbook] Gets or sets the runbook.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {string} [runOn] Gets or sets the name of the hybrid worker group
- * the webhook job will run on.
- */
-export interface WebhookCreateOrUpdateParameters {
-  name: string;
-  isEnabled?: boolean;
-  uri?: string;
-  expiryTime?: Date;
-  parameters?: { [propertyName: string]: string };
-  runbook?: RunbookAssociationProperty;
-  runOn?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the WebhookUpdateParameters class.
- * @constructor
- * The parameters supplied to the update webhook operation.
- *
- * @member {string} [name] Gets or sets the name of the webhook.
- * @member {boolean} [isEnabled] Gets or sets the value of the enabled flag of
- * webhook.
- * @member {string} [runOn] Gets or sets the name of the hybrid worker group
- * the webhook job will run on.
- * @member {object} [parameters] Gets or sets the parameters of the job.
- * @member {string} [description] Gets or sets the description of the webhook.
- */
-export interface WebhookUpdateParameters {
-  name?: string;
-  isEnabled?: boolean;
-  runOn?: string;
-  parameters?: { [propertyName: string]: string };
-  description?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the Job class.
- * @constructor
- * Definition of the job.
- *
- * @member {object} [runbook] Gets or sets the runbook.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {string} [startedBy] Gets or sets the job started by.
- * @member {string} [runOn] Gets or sets the runOn which specifies the group
- * name where the job is to be executed.
- * @member {uuid} [jobId] Gets or sets the id of the job.
- * @member {date} [creationTime] Gets or sets the creation time of the job.
- * @member {string} [status] Gets or sets the status of the job. Possible
- * values include: 'New', 'Activating', 'Running', 'Completed', 'Failed',
- * 'Stopped', 'Blocked', 'Suspended', 'Disconnected', 'Suspending', 'Stopping',
- * 'Resuming', 'Removing'
- * @member {string} [statusDetails] Gets or sets the status details of the job.
- * @member {date} [startTime] Gets or sets the start time of the job.
- * @member {date} [endTime] Gets or sets the end time of the job.
- * @member {string} [exception] Gets or sets the exception of the job.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
- * job.
- * @member {date} [lastStatusModifiedTime] Gets or sets the last status
- * modified time of the job.
- * @member {object} [parameters] Gets or sets the parameters of the job.
- * @member {string} [provisioningState] The provisioning state of a resource.
- */
-export interface Job extends ProxyResource {
-  runbook?: RunbookAssociationProperty;
-  startedBy?: string;
-  runOn?: string;
-  jobId?: string;
-  creationTime?: Date;
-  status?: string;
-  statusDetails?: string;
-  startTime?: Date;
-  endTime?: Date;
-  exception?: string;
-  lastModifiedTime?: Date;
-  lastStatusModifiedTime?: Date;
-  parameters?: { [propertyName: string]: string };
-  readonly provisioningState?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the JobCollectionItem class.
- * @constructor
- * Job collection item properties.
- *
- * @member {object} [runbook] The runbook association.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {uuid} [jobId] The id of the job.
- * @member {date} [creationTime] The creation time of the job.
- * @member {string} [status] The status of the job. Possible values include:
- * 'New', 'Activating', 'Running', 'Completed', 'Failed', 'Stopped', 'Blocked',
- * 'Suspended', 'Disconnected', 'Suspending', 'Stopping', 'Resuming',
- * 'Removing'
- * @member {date} [startTime] The start time of the job.
- * @member {date} [endTime] The end time of the job.
- * @member {date} [lastModifiedTime] The last modified time of the job.
- * @member {string} [provisioningState] The provisioning state of a resource.
- * @member {string} [runOn] Specifies the runOn group name where the job was
- * executed.
- */
-export interface JobCollectionItem extends ProxyResource {
-  readonly runbook?: RunbookAssociationProperty;
-  readonly jobId?: string;
-  readonly creationTime?: Date;
-  readonly status?: string;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  readonly lastModifiedTime?: Date;
-  readonly provisioningState?: string;
-  runOn?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the JobCreateParameters class.
- * @constructor
- * The parameters supplied to the create job operation.
- *
- * @member {object} [runbook] Gets or sets the runbook.
- * @member {string} [runbook.name] Gets or sets the name of the runbook.
- * @member {object} [parameters] Gets or sets the parameters of the job.
- * @member {string} [runOn] Gets or sets the runOn which specifies the group
- * name where the job is to be executed.
- */
-export interface JobCreateParameters {
-  runbook?: RunbookAssociationProperty;
-  parameters?: { [propertyName: string]: string };
-  runOn?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the WindowsProperties class.
- * @constructor
- * Windows specific update configuration.
- *
- * @member {string} [includedUpdateClassifications] Update classification
- * included in the software update configuration. A comma separated string with
- * required values. Possible values include: 'Unclassified', 'Critical',
- * 'Security', 'UpdateRollup', 'FeaturePack', 'ServicePack', 'Definition',
- * 'Tools', 'Updates'
- * @member {array} [excludedKbNumbers] KB numbers excluded from the software
- * update configuration.
- * @member {array} [includedKbNumbers] KB numbers included from the software
- * update configuration.
- * @member {string} [rebootSetting] Reboot setting for the software update
- * configuration.
- */
-export interface WindowsProperties {
-  includedUpdateClassifications?: string;
-  excludedKbNumbers?: string[];
-  includedKbNumbers?: string[];
-  rebootSetting?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the LinuxProperties class.
- * @constructor
- * Linux specific update configuration.
- *
- * @member {string} [includedPackageClassifications] Update classifications
- * included in the software update configuration. Possible values include:
- * 'Unclassified', 'Critical', 'Security', 'Other'
- * @member {array} [excludedPackageNameMasks] packages excluded from the
- * software update configuration.
- * @member {array} [includedPackageNameMasks] packages included from the
- * software update configuration.
- * @member {string} [rebootSetting] Reboot setting for the software update
- * configuration.
- */
-export interface LinuxProperties {
-  includedPackageClassifications?: string;
-  excludedPackageNameMasks?: string[];
-  includedPackageNameMasks?: string[];
-  rebootSetting?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the UpdateConfiguration class.
- * @constructor
- * Update specifc properties of the software update configuration.
+ * Update specifc properties of the software update configuration.
  *
  * @member {string} operatingSystem operating system of target machines.
  * Possible values include: 'Windows', 'Linux'
@@ -2509,14 +2018,147 @@ export interface UpdateConfiguration {
  * @member {string} [lastModifiedBy] lastModifiedBy property, which only
  * appears in the response.
  */
-export interface SoftwareUpdateConfiguration extends BaseResource {
+export interface SoftwareUpdateConfiguration extends BaseResource {
+  readonly name?: string;
+  readonly id?: string;
+  readonly type?: string;
+  updateConfiguration: UpdateConfiguration;
+  scheduleInfo: ScheduleProperties;
+  readonly provisioningState?: string;
+  error?: ErrorResponse;
+  readonly creationTime?: Date;
+  readonly createdBy?: string;
+  readonly lastModifiedTime?: Date;
+  readonly lastModifiedBy?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the CollectionItemUpdateConfiguration class.
+ * @constructor
+ * object returned when requesting a collection of software update
+ * configuration
+ *
+ * @member {array} [azureVirtualMachines] List of azure resource Ids for azure
+ * virtual machines targeted by the software update configuration.
+ * @member {moment.duration} [duration] Maximum time allowed for the software
+ * update configuration run. Duration needs to be specified using the format
+ * PT[n]H[n]M[n]S as per ISO8601
+ */
+export interface CollectionItemUpdateConfiguration {
+  azureVirtualMachines?: string[];
+  duration?: moment.Duration;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SoftwareUpdateConfigurationCollectionItem class.
+ * @constructor
+ * Software update configuration collection item properties.
+ *
+ * @member {string} [name] Name of the software update configuration.
+ * @member {string} [id] Resource Id of the software update configuration
+ * @member {object} [updateConfiguration] Update specific properties of the
+ * software update configuration.
+ * @member {array} [updateConfiguration.azureVirtualMachines] List of azure
+ * resource Ids for azure virtual machines targeted by the software update
+ * configuration.
+ * @member {moment.duration} [updateConfiguration.duration] Maximum time
+ * allowed for the software update configuration run. Duration needs to be
+ * specified using the format PT[n]H[n]M[n]S as per ISO8601
+ * @member {string} [frequency] execution frequency of the schedule associated
+ * with the software update configuration. Possible values include: 'OneTime',
+ * 'Day', 'Hour', 'Week', 'Month'
+ * @member {date} [startTime] the start time of the update.
+ * @member {date} [creationTime] Creation time of the software update
+ * configuration, which only appears in the response.
+ * @member {date} [lastModifiedTime] Last time software update configuration
+ * was modified, which only appears in the response.
+ * @member {string} [provisioningState] Provisioning state for the software
+ * update configuration, which only appears in the response.
+ * @member {date} [nextRun] ext run time of the update.
+ */
+export interface SoftwareUpdateConfigurationCollectionItem {
+  readonly name?: string;
+  readonly id?: string;
+  updateConfiguration?: CollectionItemUpdateConfiguration;
+  frequency?: string;
+  startTime?: Date;
+  readonly creationTime?: Date;
+  readonly lastModifiedTime?: Date;
+  readonly provisioningState?: string;
+  nextRun?: Date;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SoftwareUpdateConfigurationListResult class.
+ * @constructor
+ * result of listing all software update configuration
+ *
+ * @member {array} [value] outer object returned when listing all software
+ * update configurations
+ */
+export interface SoftwareUpdateConfigurationListResult {
+  value?: SoftwareUpdateConfigurationCollectionItem[];
+}
+
+/**
+ * @class
+ * Initializes a new instance of the UpdateConfigurationNavigation class.
+ * @constructor
+ * Software update configuration Run Navigation model.
+ *
+ * @member {string} [name] Name of the software update configuration triggered
+ * the software update configuration run
+ */
+export interface UpdateConfigurationNavigation {
+  readonly name?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SoftwareUpdateConfigurationRun class.
+ * @constructor
+ * Software update configuration Run properties.
+ *
+ * @member {string} [name] Name of the software update configuration run.
+ * @member {string} [id] Resource Id of the software update configuration run
+ * @member {object} [softwareUpdateConfiguration] software update configuration
+ * triggered this run
+ * @member {string} [softwareUpdateConfiguration.name] Name of the software
+ * update configuration triggered the software update configuration run
+ * @member {string} [status] Status of the software update configuration run.
+ * @member {string} [configuredDuration] configured duration for the software
+ * update configuration run.
+ * @member {string} [osType] Operating system target of the software update
+ * configuration triggered this run
+ * @member {date} [startTime] Etart time of the software update configuration
+ * run.
+ * @member {date} [endTime] End time of the software update configuration run.
+ * @member {number} [computerCount] Number of computers in the software update
+ * configuration run.
+ * @member {number} [failedCount] Number of computers with failed status.
+ * @member {date} [creationTime] Creation time of theresource, which only
+ * appears in the response.
+ * @member {string} [createdBy] createdBy property, which only appears in the
+ * response.
+ * @member {date} [lastModifiedTime] Last time resource was modified, which
+ * only appears in the response.
+ * @member {string} [lastModifiedBy] lastModifiedBy property, which only
+ * appears in the response.
+ */
+export interface SoftwareUpdateConfigurationRun {
   readonly name?: string;
   readonly id?: string;
-  readonly type?: string;
-  updateConfiguration: UpdateConfiguration;
-  scheduleInfo: ScheduleProperties;
-  readonly provisioningState?: string;
-  error?: ErrorResponse;
+  softwareUpdateConfiguration?: UpdateConfigurationNavigation;
+  readonly status?: string;
+  readonly configuredDuration?: string;
+  readonly osType?: string;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  readonly computerCount?: number;
+  readonly failedCount?: number;
   readonly creationTime?: Date;
   readonly createdBy?: string;
   readonly lastModifiedTime?: Date;
@@ -2525,460 +2167,642 @@ export interface SoftwareUpdateConfiguration extends BaseResource {
 
 /**
  * @class
- * Initializes a new instance of the CollectionItemUpdateConfiguration class.
+ * Initializes a new instance of the SoftwareUpdateConfigurationRunListResult class.
  * @constructor
- * object returned when requesting a collection of software update
- * configuration
+ * result of listing all software update configuration runs
  *
- * @member {array} [azureVirtualMachines] List of azure resource Ids for azure
- * virtual machines targeted by the software update configuration.
- * @member {moment.duration} [duration] Maximum time allowed for the software
- * update configuration run. Duration needs to be specified using the format
- * PT[n]H[n]M[n]S as per ISO8601
+ * @member {array} [value] outer object returned when listing all software
+ * update configuration runs
+ * @member {string} [nextLink] link to next page of results.
  */
-export interface CollectionItemUpdateConfiguration {
-  azureVirtualMachines?: string[];
-  duration?: moment.Duration;
+export interface SoftwareUpdateConfigurationRunListResult {
+  value?: SoftwareUpdateConfigurationRun[];
+  nextLink?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationCollectionItem class.
+ * Initializes a new instance of the JobNavigation class.
  * @constructor
- * Software update configuration collection item properties.
+ * Software update configuration machine run job navigation properties.
  *
- * @member {string} [name] Name of the software update configuration.
+ * @member {string} [id] Id of the job associated with the software update
+ * configuration run
+ */
+export interface JobNavigation {
+  readonly id?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SoftwareUpdateConfigurationMachineRun class.
+ * @constructor
+ * Software update configuration machine run model.
+ *
+ * @member {string} [name] Name of the software update configuration machine
+ * run
  * @member {string} [id] Resource Id of the software update configuration
- * @member {object} [updateConfiguration] Update specific properties of the
- * software update configuration.
- * @member {array} [updateConfiguration.azureVirtualMachines] List of azure
- * resource Ids for azure virtual machines targeted by the software update
- * configuration.
- * @member {moment.duration} [updateConfiguration.duration] Maximum time
- * allowed for the software update configuration run. Duration needs to be
- * specified using the format PT[n]H[n]M[n]S as per ISO8601
- * @member {string} [frequency] execution frequency of the schedule associated
- * with the software update configuration. Possible values include: 'OneTime',
- * 'Day', 'Hour', 'Week', 'Month'
- * @member {date} [startTime] the start time of the update.
- * @member {date} [creationTime] Creation time of the software update
- * configuration, which only appears in the response.
- * @member {date} [lastModifiedTime] Last time software update configuration
- * was modified, which only appears in the response.
- * @member {string} [provisioningState] Provisioning state for the software
- * update configuration, which only appears in the response.
- * @member {date} [nextRun] ext run time of the update.
+ * machine run
+ * @member {string} [targetComputer] name of the updated computer
+ * @member {string} [targetComputerType] type of the updated computer.
+ * @member {object} [softwareUpdateConfiguration] software update configuration
+ * triggered this run
+ * @member {string} [softwareUpdateConfiguration.name] Name of the software
+ * update configuration triggered the software update configuration run
+ * @member {string} [status] Status of the software update configuration
+ * machine run.
+ * @member {string} [osType] Operating system target of the software update
+ * configuration triggered this run
+ * @member {uuid} [correlationId] correlation id of the software update
+ * configuration machine run
+ * @member {uuid} [sourceComputerId] source computer id of the software update
+ * configuration machine run
+ * @member {date} [startTime] Start time of the software update configuration
+ * machine run.
+ * @member {date} [endTime] End time of the software update configuration
+ * machine run.
+ * @member {string} [configuredDuration] configured duration for the software
+ * update configuration run.
+ * @member {object} [job] Job associated with the software update configuration
+ * machine run
+ * @member {string} [job.id] Id of the job associated with the software update
+ * configuration run
+ * @member {date} [creationTime] Creation time of theresource, which only
+ * appears in the response.
+ * @member {string} [createdBy] createdBy property, which only appears in the
+ * response.
+ * @member {date} [lastModifiedTime] Last time resource was modified, which
+ * only appears in the response.
+ * @member {string} [lastModifiedBy] lastModifiedBy property, which only
+ * appears in the response.
  */
-export interface SoftwareUpdateConfigurationCollectionItem {
+export interface SoftwareUpdateConfigurationMachineRun {
+  readonly name?: string;
+  readonly id?: string;
+  readonly targetComputer?: string;
+  readonly targetComputerType?: string;
+  softwareUpdateConfiguration?: UpdateConfigurationNavigation;
+  readonly status?: string;
+  readonly osType?: string;
+  readonly correlationId?: string;
+  readonly sourceComputerId?: string;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  readonly configuredDuration?: string;
+  job?: JobNavigation;
+  readonly creationTime?: Date;
+  readonly createdBy?: string;
+  readonly lastModifiedTime?: Date;
+  readonly lastModifiedBy?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SoftwareUpdateConfigurationMachineRunListResult class.
+ * @constructor
+ * result of listing all software update configuration machine runs
+ *
+ * @member {array} [value] outer object returned when listing all software
+ * update configuration machine runs
+ * @member {string} [nextLink] link to next page of results.
+ */
+export interface SoftwareUpdateConfigurationMachineRunListResult {
+  value?: SoftwareUpdateConfigurationMachineRun[];
+  nextLink?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SourceControl class.
+ * @constructor
+ * Definition of the source control.
+ *
+ * @member {string} [repoUrl] Gets or sets the repo url of the source control.
+ * @member {string} [branch] Gets or sets the repo branch of the source
+ * control. Include branch as empty string for VsoTfvc.
+ * @member {string} [folderPath] Gets or sets the folder path of the source
+ * control.
+ * @member {boolean} [autoSync] Gets or sets auto async of the source control.
+ * Default is false.
+ * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
+ * source control. Default is true.
+ * @member {string} [sourceType] The source type. Must be one of VsoGit,
+ * VsoTfvc, GitHub. Possible values include: 'VsoGit', 'VsoTfvc', 'GitHub'
+ * @member {string} [description] Gets or sets the description.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ */
+export interface SourceControl extends ProxyResource {
+  repoUrl?: string;
+  branch?: string;
+  folderPath?: string;
+  autoSync?: boolean;
+  publishRunbook?: boolean;
+  sourceType?: string;
+  description?: string;
+  creationTime?: Date;
+  lastModifiedTime?: Date;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SourceControlUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the update source control operation.
+ *
+ * @member {string} [branch] Gets or sets the repo branch of the source
+ * control.
+ * @member {string} [folderPath] Gets or sets the folder path of the source
+ * control. Path must be relative.
+ * @member {boolean} [autoSync] Gets or sets auto async of the source control.
+ * Default is false.
+ * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
+ * source control. Default is true.
+ * @member {string} [securityToken] Gets or sets the authorization token for
+ * the repo of the source control.
+ * @member {string} [description] Gets or sets the user description of the
+ * source control.
+ */
+export interface SourceControlUpdateParameters {
+  branch?: string;
+  folderPath?: string;
+  autoSync?: boolean;
+  publishRunbook?: boolean;
+  securityToken?: string;
+  description?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SourceControlCreateOrUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the create or update source control operation.
+ *
+ * @member {string} [repoUrl] Gets or sets the repo url of the source control.
+ * @member {string} [branch] Gets or sets the repo branch of the source
+ * control. Include branch as empty string for VsoTfvc.
+ * @member {string} [folderPath] Gets or sets the folder path of the source
+ * control. Path must be relative.
+ * @member {boolean} [autoSync] Gets or sets auto async of the source control.
+ * Default is false.
+ * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
+ * source control. Default is true.
+ * @member {string} [sourceType] The source type. Must be one of VsoGit,
+ * VsoTfvc, GitHub, case sensitive. Possible values include: 'VsoGit',
+ * 'VsoTfvc', 'GitHub'
+ * @member {string} [securityToken] Gets or sets the authorization token for
+ * the repo of the source control.
+ * @member {string} [description] Gets or sets the user description of the
+ * source control.
+ */
+export interface SourceControlCreateOrUpdateParameters {
+  repoUrl?: string;
+  branch?: string;
+  folderPath?: string;
+  autoSync?: boolean;
+  publishRunbook?: boolean;
+  sourceType?: string;
+  securityToken?: string;
+  description?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the SourceControlSyncJob class.
+ * @constructor
+ * Definition of the source control sync job.
+ *
+ * @member {string} [name] Resource name.
+ * @member {string} [type] Resource type.
+ * @member {string} [id] Resource id.
+ * @member {string} [syncJobId] Gets the source control sync job id.
+ * @member {date} [creationTime] Gets the creation time of the job.
+ * @member {string} [provisioningState] Gets the provisioning state of the job.
+ * Possible values include: 'Completed', 'Failed', 'Running'
+ * @member {date} [startTime] Gets the start time of the job.
+ * @member {date} [endTime] Gets the end time of the job.
+ * @member {string} [startType] Gets the type of start for the sync job.
+ * Possible values include: 'AutoSync', 'ManualSync'
+ */
+export interface SourceControlSyncJob {
   readonly name?: string;
+  readonly type?: string;
   readonly id?: string;
-  updateConfiguration?: CollectionItemUpdateConfiguration;
-  frequency?: string;
-  startTime?: Date;
+  syncJobId?: string;
   readonly creationTime?: Date;
-  readonly lastModifiedTime?: Date;
-  readonly provisioningState?: string;
-  nextRun?: Date;
+  provisioningState?: string;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  startType?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationListResult class.
+ * Initializes a new instance of the SourceControlSyncJobCreateParameters class.
  * @constructor
- * result of listing all software update configuration
+ * The parameters supplied to the create source control sync job operation.
  *
- * @member {array} [value] outer object returned when listing all software
- * update configurations
+ * @member {string} [commitId] Sets the commit id of the source control sync
+ * job.
  */
-export interface SoftwareUpdateConfigurationListResult {
-  value?: SoftwareUpdateConfigurationCollectionItem[];
+export interface SourceControlSyncJobCreateParameters {
+  commitId?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the UpdateConfigurationNavigation class.
+ * Initializes a new instance of the SourceControlSyncJobById class.
  * @constructor
- * Software update configuration Run Navigation model.
+ * Definition of the source control sync job.
  *
- * @member {string} [name] Name of the software update configuration triggered
- * the software update configuration run
+ * @member {string} [id] Gets the id of the job.
+ * @member {string} [syncJobId] Gets the source control sync job id.
+ * @member {date} [creationTime] Gets the creation time of the job.
+ * @member {string} [provisioningState] Gets the provisioning state of the job.
+ * Possible values include: 'Completed', 'Failed', 'Running'
+ * @member {date} [startTime] Gets the start time of the job.
+ * @member {date} [endTime] Gets the end time of the job.
+ * @member {string} [startType] Gets the type of start for the sync job.
+ * Possible values include: 'AutoSync', 'ManualSync'
+ * @member {string} [exception] Gets the exceptions that occured while running
+ * the sync job.
  */
-export interface UpdateConfigurationNavigation {
-  readonly name?: string;
+export interface SourceControlSyncJobById {
+  id?: string;
+  syncJobId?: string;
+  readonly creationTime?: Date;
+  provisioningState?: string;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  startType?: string;
+  exception?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the JobNavigation class.
+ * Initializes a new instance of the SourceControlSyncJobStream class.
  * @constructor
- * Software update configuration machine run job navigation properties.
+ * Definition of the source control sync job stream.
  *
- * @member {string} [id] Id of the job associated with the software update
- * configuration run
+ * @member {string} [id] Resource id.
+ * @member {string} [syncJobStreamId] Gets the sync job stream id.
+ * @member {string} [summary] Gets the summary of the sync job stream.
+ * @member {date} [time] Gets the time of the sync job stream.
+ * @member {string} [streamType] Gets the type of the sync job stream. Possible
+ * values include: 'Error', 'Output'
  */
-export interface JobNavigation {
+export interface SourceControlSyncJobStream {
   readonly id?: string;
+  syncJobStreamId?: string;
+  summary?: string;
+  readonly time?: Date;
+  streamType?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationRun class.
+ * Initializes a new instance of the SourceControlSyncJobStreamById class.
  * @constructor
- * Software update configuration Run properties.
+ * Definition of the source control sync job stream by id.
  *
- * @member {string} [name] Name of the software update configuration run.
- * @member {string} [id] Resource Id of the software update configuration run
- * @member {object} [softwareUpdateConfiguration] software update configuration
- * triggered this run
- * @member {string} [softwareUpdateConfiguration.name] Name of the software
- * update configuration triggered the software update configuration run
- * @member {string} [status] Status of the software update configuration run.
- * @member {string} [configuredDuration] configured duration for the software
- * update configuration run.
- * @member {string} [osType] Operating system target of the software update
- * configuration triggered this run
- * @member {date} [startTime] Etart time of the software update configuration
- * run.
- * @member {date} [endTime] End time of the software update configuration run.
- * @member {number} [computerCount] Number of computers in the software update
- * configuration run.
- * @member {number} [failedCount] Number of computers with failed status.
- * @member {date} [creationTime] Creation time of theresource, which only
- * appears in the response.
- * @member {string} [createdBy] createdBy property, which only appears in the
- * response.
- * @member {date} [lastModifiedTime] Last time resource was modified, which
- * only appears in the response.
- * @member {string} [lastModifiedBy] lastModifiedBy property, which only
- * appears in the response.
+ * @member {string} [id] Resource id.
+ * @member {string} [syncJobStreamId] Gets the sync job stream id.
+ * @member {string} [summary] Gets the summary of the sync job stream.
+ * @member {date} [time] Gets the time of the sync job stream.
+ * @member {string} [streamType] Gets the type of the sync job stream. Possible
+ * values include: 'Error', 'Output'
+ * @member {string} [streamText] Gets the text of the sync job stream.
+ * @member {string} [value] Gets the value of the sync job stream.
  */
-export interface SoftwareUpdateConfigurationRun {
-  readonly name?: string;
+export interface SourceControlSyncJobStreamById {
   readonly id?: string;
-  softwareUpdateConfiguration?: UpdateConfigurationNavigation;
-  readonly status?: string;
-  readonly configuredDuration?: string;
-  readonly osType?: string;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  readonly computerCount?: number;
-  readonly failedCount?: number;
-  readonly creationTime?: Date;
-  readonly createdBy?: string;
-  readonly lastModifiedTime?: Date;
-  readonly lastModifiedBy?: string;
+  syncJobStreamId?: string;
+  summary?: string;
+  readonly time?: Date;
+  streamType?: string;
+  streamText?: string;
+  value?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationRunListResult class.
+ * Initializes a new instance of the Job class.
  * @constructor
- * result of listing all software update configuration runs
+ * Definition of the job.
  *
- * @member {array} [value] outer object returned when listing all software
- * update configuration runs
- * @member {string} [nextLink] link to next page of results.
+ * @member {object} [runbook] Gets or sets the runbook.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {string} [startedBy] Gets or sets the job started by.
+ * @member {string} [runOn] Gets or sets the runOn which specifies the group
+ * name where the job is to be executed.
+ * @member {uuid} [jobId] Gets or sets the id of the job.
+ * @member {date} [creationTime] Gets or sets the creation time of the job.
+ * @member {string} [status] Gets or sets the status of the job. Possible
+ * values include: 'New', 'Activating', 'Running', 'Completed', 'Failed',
+ * 'Stopped', 'Blocked', 'Suspended', 'Disconnected', 'Suspending', 'Stopping',
+ * 'Resuming', 'Removing'
+ * @member {string} [statusDetails] Gets or sets the status details of the job.
+ * @member {date} [startTime] Gets or sets the start time of the job.
+ * @member {date} [endTime] Gets or sets the end time of the job.
+ * @member {string} [exception] Gets or sets the exception of the job.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time of the
+ * job.
+ * @member {date} [lastStatusModifiedTime] Gets or sets the last status
+ * modified time of the job.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {string} [provisioningState] The current provisioning state of the
+ * job. Possible values include: 'Failed', 'Succeeded', 'Suspended',
+ * 'Processing'
  */
-export interface SoftwareUpdateConfigurationRunListResult {
-  value?: SoftwareUpdateConfigurationRun[];
-  nextLink?: string;
+export interface Job extends ProxyResource {
+  runbook?: RunbookAssociationProperty;
+  startedBy?: string;
+  runOn?: string;
+  jobId?: string;
+  creationTime?: Date;
+  status?: string;
+  statusDetails?: string;
+  startTime?: Date;
+  endTime?: Date;
+  exception?: string;
+  lastModifiedTime?: Date;
+  lastStatusModifiedTime?: Date;
+  parameters?: { [propertyName: string]: string };
+  provisioningState?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationMachineRun class.
+ * Initializes a new instance of the JobCollectionItem class.
  * @constructor
- * Software update configuration machine run model.
+ * Job collection item properties.
  *
- * @member {string} [name] Name of the software update configuration machine
- * run
- * @member {string} [id] Resource Id of the software update configuration
- * machine run
- * @member {string} [targetComputer] name of the updated computer
- * @member {string} [targetComputerType] type of the updated computer.
- * @member {object} [softwareUpdateConfiguration] software update configuration
- * triggered this run
- * @member {string} [softwareUpdateConfiguration.name] Name of the software
- * update configuration triggered the software update configuration run
- * @member {string} [status] Status of the software update configuration
- * machine run.
- * @member {string} [osType] Operating system target of the software update
- * configuration triggered this run
- * @member {uuid} [correlationId] correlation id of the software update
- * configuration machine run
- * @member {uuid} [sourceComputerId] source computer id of the software update
- * configuration machine run
- * @member {date} [startTime] Start time of the software update configuration
- * machine run.
- * @member {date} [endTime] End time of the software update configuration
- * machine run.
- * @member {string} [configuredDuration] configured duration for the software
- * update configuration run.
- * @member {object} [job] Job associated with the software update configuration
- * machine run
- * @member {string} [job.id] Id of the job associated with the software update
- * configuration run
- * @member {date} [creationTime] Creation time of theresource, which only
- * appears in the response.
- * @member {string} [createdBy] createdBy property, which only appears in the
- * response.
- * @member {date} [lastModifiedTime] Last time resource was modified, which
- * only appears in the response.
- * @member {string} [lastModifiedBy] lastModifiedBy property, which only
- * appears in the response.
+ * @member {object} [runbook] The runbook association.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {uuid} [jobId] The id of the job.
+ * @member {date} [creationTime] The creation time of the job.
+ * @member {string} [status] The status of the job. Possible values include:
+ * 'New', 'Activating', 'Running', 'Completed', 'Failed', 'Stopped', 'Blocked',
+ * 'Suspended', 'Disconnected', 'Suspending', 'Stopping', 'Resuming',
+ * 'Removing'
+ * @member {date} [startTime] The start time of the job.
+ * @member {date} [endTime] The end time of the job.
+ * @member {date} [lastModifiedTime] The last modified time of the job.
+ * @member {string} [provisioningState] The provisioning state of a resource.
+ * @member {string} [runOn] Specifies the runOn group name where the job was
+ * executed.
  */
-export interface SoftwareUpdateConfigurationMachineRun {
-  readonly name?: string;
-  readonly id?: string;
-  readonly targetComputer?: string;
-  readonly targetComputerType?: string;
-  softwareUpdateConfiguration?: UpdateConfigurationNavigation;
+export interface JobCollectionItem extends ProxyResource {
+  readonly runbook?: RunbookAssociationProperty;
+  readonly jobId?: string;
+  readonly creationTime?: Date;
   readonly status?: string;
-  readonly osType?: string;
-  readonly correlationId?: string;
-  readonly sourceComputerId?: string;
   readonly startTime?: Date;
   readonly endTime?: Date;
-  readonly configuredDuration?: string;
-  job?: JobNavigation;
-  readonly creationTime?: Date;
-  readonly createdBy?: string;
   readonly lastModifiedTime?: Date;
-  readonly lastModifiedBy?: string;
+  readonly provisioningState?: string;
+  runOn?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the JobCreateParameters class.
+ * @constructor
+ * The parameters supplied to the create job operation.
+ *
+ * @member {object} [runbook] Gets or sets the runbook.
+ * @member {string} [runbook.name] Gets or sets the name of the runbook.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {string} [runOn] Gets or sets the runOn which specifies the group
+ * name where the job is to be executed.
+ */
+export interface JobCreateParameters {
+  runbook?: RunbookAssociationProperty;
+  parameters?: { [propertyName: string]: string };
+  runOn?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SoftwareUpdateConfigurationMachineRunListResult class.
+ * Initializes a new instance of the DscReportError class.
  * @constructor
- * result of listing all software update configuration machine runs
+ * Definition of the dsc node report error type.
  *
- * @member {array} [value] outer object returned when listing all software
- * update configuration machine runs
- * @member {string} [nextLink] link to next page of results.
+ * @member {string} [errorSource] Gets or sets the source of the error.
+ * @member {string} [resourceId] Gets or sets the resource ID which generated
+ * the error.
+ * @member {string} [errorCode] Gets or sets the error code.
+ * @member {string} [errorMessage] Gets or sets the error message.
+ * @member {string} [locale] Gets or sets the locale of the error.
+ * @member {string} [errorDetails] Gets or sets the error details.
  */
-export interface SoftwareUpdateConfigurationMachineRunListResult {
-  value?: SoftwareUpdateConfigurationMachineRun[];
-  nextLink?: string;
+export interface DscReportError {
+  errorSource?: string;
+  resourceId?: string;
+  errorCode?: string;
+  errorMessage?: string;
+  locale?: string;
+  errorDetails?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlCreateOrUpdateParameters class.
+ * Initializes a new instance of the DscReportResourceNavigation class.
  * @constructor
- * The parameters supplied to the create or update source control operation.
+ * Navigation for DSC Report Resource.
  *
- * @member {string} [repoUrl] Gets or sets the repo url of the source control.
- * @member {string} [branch] Gets or sets the repo branch of the source
- * control. Include branch as empty string for VsoTfvc.
- * @member {string} [folderPath] Gets or sets the folder path of the source
- * control. Path must be relative.
- * @member {boolean} [autoSync] Gets or sets auto async of the source control.
- * Default is false.
- * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
- * source control. Default is true.
- * @member {string} [sourceType] The source type. Must be one of VsoGit,
- * VsoTfvc, GitHub, case sensitive. Possible values include: 'VsoGit',
- * 'VsoTfvc', 'GitHub'
- * @member {string} [securityToken] Gets or sets the authorization token for
- * the repo of the source control.
- * @member {string} [description] Gets or sets the user description of the
- * source control.
+ * @member {string} [resourceId] Gets or sets the ID of the resource to
+ * navigate to.
  */
-export interface SourceControlCreateOrUpdateParameters {
-  repoUrl?: string;
-  branch?: string;
-  folderPath?: string;
-  autoSync?: boolean;
-  publishRunbook?: boolean;
-  sourceType?: string;
-  securityToken?: string;
-  description?: string;
+export interface DscReportResourceNavigation {
+  resourceId?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControl class.
+ * Initializes a new instance of the DscReportResource class.
  * @constructor
- * Definition of the source control.
+ * Definition of the DSC Report Resource.
  *
- * @member {string} [name] Resource name.
- * @member {string} [id] Resource Id.
- * @member {string} [type] Resource type.
- * @member {string} [repoUrl] Gets or sets the repo url of the source control.
- * @member {string} [branch] Gets or sets the repo branch of the source
- * control. Include branch as empty string for VsoTfvc.
- * @member {string} [folderPath] Gets or sets the folder path of the source
- * control.
- * @member {boolean} [autoSync] Gets or sets auto async of the source control.
- * Default is false.
- * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
- * source control. Default is true.
- * @member {string} [sourceType] The source type. Must be one of VsoGit,
- * VsoTfvc, GitHub. Possible values include: 'VsoGit', 'VsoTfvc', 'GitHub'
- * @member {string} [description] Gets or sets the description.
- * @member {date} [creationTime] Gets or sets the creation time.
- * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [resourceId] Gets or sets the ID of the resource.
+ * @member {string} [sourceInfo] Gets or sets the source info of the resource.
+ * @member {array} [dependsOn] Gets or sets the Resource Navigation values for
+ * resources the resource depends on.
+ * @member {string} [moduleName] Gets or sets the module name of the resource.
+ * @member {string} [moduleVersion] Gets or sets the module version of the
+ * resource.
+ * @member {string} [resourceName] Gets or sets the name of the resource.
+ * @member {string} [error] Gets or sets the error of the resource.
+ * @member {string} [status] Gets or sets the status of the resource.
+ * @member {number} [durationInSeconds] Gets or sets the duration in seconds
+ * for the resource.
+ * @member {date} [startDate] Gets or sets the start date of the resource.
  */
-export interface SourceControl extends BaseResource {
-  readonly name?: string;
-  readonly id?: string;
-  readonly type?: string;
-  repoUrl?: string;
-  branch?: string;
-  folderPath?: string;
-  autoSync?: boolean;
-  publishRunbook?: boolean;
-  sourceType?: string;
-  description?: string;
-  creationTime?: Date;
-  lastModifiedTime?: Date;
+export interface DscReportResource {
+  resourceId?: string;
+  sourceInfo?: string;
+  dependsOn?: DscReportResourceNavigation[];
+  moduleName?: string;
+  moduleVersion?: string;
+  resourceName?: string;
+  error?: string;
+  status?: string;
+  durationInSeconds?: number;
+  startDate?: Date;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlUpdateParameters class.
+ * Initializes a new instance of the DscMetaConfiguration class.
  * @constructor
- * The parameters supplied to the update source control operation.
+ * Definition of the DSC Meta Configuration.
  *
- * @member {string} [branch] Gets or sets the repo branch of the source
- * control.
- * @member {string} [folderPath] Gets or sets the folder path of the source
- * control. Path must be relative.
- * @member {boolean} [autoSync] Gets or sets auto async of the source control.
- * Default is false.
- * @member {boolean} [publishRunbook] Gets or sets the auto publish of the
- * source control. Default is true.
- * @member {string} [securityToken] Gets or sets the authorization token for
- * the repo of the source control.
- * @member {string} [description] Gets or sets the user description of the
- * source control.
+ * @member {number} [configurationModeFrequencyMins] Gets or sets the
+ * ConfigurationModeFrequencyMins value of the meta configuration.
+ * @member {boolean} [rebootNodeIfNeeded] Gets or sets the RebootNodeIfNeeded
+ * value of the meta configuration.
+ * @member {string} [configurationMode] Gets or sets the ConfigurationMode
+ * value of the meta configuration.
+ * @member {string} [actionAfterReboot] Gets or sets the ActionAfterReboot
+ * value of the meta configuration.
+ * @member {string} [certificateId] Gets or sets the CertificateId value of the
+ * meta configuration.
+ * @member {number} [refreshFrequencyMins] Gets or sets the
+ * RefreshFrequencyMins value of the meta configuration.
+ * @member {boolean} [allowModuleOverwrite] Gets or sets the
+ * AllowModuleOverwrite value of the meta configuration.
  */
-export interface SourceControlUpdateParameters {
-  branch?: string;
-  folderPath?: string;
-  autoSync?: boolean;
-  publishRunbook?: boolean;
-  securityToken?: string;
-  description?: string;
+export interface DscMetaConfiguration {
+  configurationModeFrequencyMins?: number;
+  rebootNodeIfNeeded?: boolean;
+  configurationMode?: string;
+  actionAfterReboot?: string;
+  certificateId?: string;
+  refreshFrequencyMins?: number;
+  allowModuleOverwrite?: boolean;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlSyncJob class.
+ * Initializes a new instance of the DscNodeReport class.
  * @constructor
- * Definition of the source control sync job.
+ * Definition of the dsc node report type.
  *
- * @member {string} [name] Resource name.
- * @member {string} [type] Resource type.
- * @member {string} [id] Resource id.
- * @member {string} [syncJobId] Gets the source control sync job id.
- * @member {date} [creationTime] Gets the creation time of the job.
- * @member {string} [provisioningState] Gets the provisioning state of the job.
- * Possible values include: 'Completed', 'Failed', 'Running'
- * @member {date} [startTime] Gets the start time of the job.
- * @member {date} [endTime] Gets the end time of the job.
- * @member {string} [startType] Gets the type of start for the sync job.
- * Possible values include: 'AutoSync', 'ManualSync'
+ * @member {date} [endTime] Gets or sets the end time of the node report.
+ * @member {date} [lastModifiedTime] Gets or sets the lastModifiedTime of the
+ * node report.
+ * @member {date} [startTime] Gets or sets the start time of the node report.
+ * @member {string} [type] Gets or sets the type of the node report.
+ * @member {string} [reportId] Gets or sets the id of the node report.
+ * @member {string} [status] Gets or sets the status of the node report.
+ * @member {string} [refreshMode] Gets or sets the refreshMode of the node
+ * report.
+ * @member {string} [rebootRequested] Gets or sets the rebootRequested of the
+ * node report.
+ * @member {string} [reportFormatVersion] Gets or sets the reportFormatVersion
+ * of the node report.
+ * @member {string} [configurationVersion] Gets or sets the
+ * configurationVersion of the node report.
+ * @member {string} [id] Gets or sets the id.
+ * @member {array} [errors] Gets or sets the errors for the node report.
+ * @member {array} [resources] Gets or sets the resource for the node report.
+ * @member {object} [metaConfiguration] Gets or sets the metaConfiguration of
+ * the node at the time of the report.
+ * @member {number} [metaConfiguration.configurationModeFrequencyMins] Gets or
+ * sets the ConfigurationModeFrequencyMins value of the meta configuration.
+ * @member {boolean} [metaConfiguration.rebootNodeIfNeeded] Gets or sets the
+ * RebootNodeIfNeeded value of the meta configuration.
+ * @member {string} [metaConfiguration.configurationMode] Gets or sets the
+ * ConfigurationMode value of the meta configuration.
+ * @member {string} [metaConfiguration.actionAfterReboot] Gets or sets the
+ * ActionAfterReboot value of the meta configuration.
+ * @member {string} [metaConfiguration.certificateId] Gets or sets the
+ * CertificateId value of the meta configuration.
+ * @member {number} [metaConfiguration.refreshFrequencyMins] Gets or sets the
+ * RefreshFrequencyMins value of the meta configuration.
+ * @member {boolean} [metaConfiguration.allowModuleOverwrite] Gets or sets the
+ * AllowModuleOverwrite value of the meta configuration.
+ * @member {string} [hostName] Gets or sets the hostname of the node that sent
+ * the report.
+ * @member {array} [iPV4Addresses] Gets or sets the IPv4 address of the node
+ * that sent the report.
+ * @member {array} [iPV6Addresses] Gets or sets the IPv6 address of the node
+ * that sent the report.
+ * @member {number} [numberOfResources] Gets or sets the number of resource in
+ * the node report.
+ * @member {string} [rawErrors] Gets or sets the unparsed errors for the node
+ * report.
  */
-export interface SourceControlSyncJob {
-  readonly name?: string;
-  readonly type?: string;
-  readonly id?: string;
-  syncJobId?: string;
-  readonly creationTime?: Date;
-  provisioningState?: string;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  startType?: string;
+export interface DscNodeReport {
+  endTime?: Date;
+  lastModifiedTime?: Date;
+  startTime?: Date;
+  type?: string;
+  reportId?: string;
+  status?: string;
+  refreshMode?: string;
+  rebootRequested?: string;
+  reportFormatVersion?: string;
+  configurationVersion?: string;
+  id?: string;
+  errors?: DscReportError[];
+  resources?: DscReportResource[];
+  metaConfiguration?: DscMetaConfiguration;
+  hostName?: string;
+  iPV4Addresses?: string[];
+  iPV6Addresses?: string[];
+  numberOfResources?: number;
+  rawErrors?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlSyncJobCreateParameters class.
+ * Initializes a new instance of the AgentRegistrationKeys class.
  * @constructor
- * The parameters supplied to the create source control sync job operation.
+ * Definition of the agent registration keys.
  *
- * @member {string} [commitId] Sets the commit id of the source control sync
- * job.
+ * @member {string} [primary] Gets or sets the primary key.
+ * @member {string} [secondary] Gets or sets the secondary key.
  */
-export interface SourceControlSyncJobCreateParameters {
-  commitId?: string;
+export interface AgentRegistrationKeys {
+  primary?: string;
+  secondary?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlSyncJobById class.
+ * Initializes a new instance of the AgentRegistration class.
  * @constructor
- * Definition of the source control sync job.
+ * Definition of the agent registration infomration type.
  *
- * @member {string} [id] Gets the id of the job.
- * @member {string} [syncJobId] Gets the source control sync job id.
- * @member {date} [creationTime] Gets the creation time of the job.
- * @member {string} [provisioningState] Gets the provisioning state of the job.
- * Possible values include: 'Completed', 'Failed', 'Running'
- * @member {date} [startTime] Gets the start time of the job.
- * @member {date} [endTime] Gets the end time of the job.
- * @member {string} [startType] Gets the type of start for the sync job.
- * Possible values include: 'AutoSync', 'ManualSync'
- * @member {string} [exception] Gets the exceptions that occured while running
- * the sync job.
+ * @member {string} [dscMetaConfiguration] Gets or sets the dsc meta
+ * configuration.
+ * @member {string} [endpoint] Gets or sets the dsc server endpoint.
+ * @member {object} [keys] Gets or sets the agent registration keys.
+ * @member {string} [keys.primary] Gets or sets the primary key.
+ * @member {string} [keys.secondary] Gets or sets the secondary key.
+ * @member {string} [id] Gets or sets the id.
  */
-export interface SourceControlSyncJobById {
+export interface AgentRegistration {
+  dscMetaConfiguration?: string;
+  endpoint?: string;
+  keys?: AgentRegistrationKeys;
   id?: string;
-  syncJobId?: string;
-  readonly creationTime?: Date;
-  provisioningState?: string;
-  readonly startTime?: Date;
-  readonly endTime?: Date;
-  startType?: string;
-  exception?: string;
-}
-
-/**
- * @class
- * Initializes a new instance of the SourceControlSyncJobStream class.
- * @constructor
- * Definition of the source control sync job stream.
- *
- * @member {string} [id] Resource id.
- * @member {string} [syncJobStreamId] Gets the sync job stream id.
- * @member {string} [summary] Gets the summary of the sync job stream.
- * @member {date} [time] Gets the time of the sync job stream.
- * @member {string} [streamType] Gets the type of the sync job stream. Possible
- * values include: 'Error', 'Output'
- */
-export interface SourceControlSyncJobStream {
-  readonly id?: string;
-  syncJobStreamId?: string;
-  summary?: string;
-  readonly time?: Date;
-  streamType?: string;
 }
 
 /**
  * @class
- * Initializes a new instance of the SourceControlSyncJobStreamById class.
+ * Initializes a new instance of the DscNodeExtensionHandlerAssociationProperty class.
  * @constructor
- * Definition of the source control sync job stream by id.
+ * The dsc extensionHandler property associated with the node
  *
- * @member {string} [id] Resource id.
- * @member {string} [syncJobStreamId] Gets the sync job stream id.
- * @member {string} [summary] Gets the summary of the sync job stream.
- * @member {date} [time] Gets the time of the sync job stream.
- * @member {string} [streamType] Gets the type of the sync job stream. Possible
- * values include: 'Error', 'Output'
- * @member {string} [streamText] Gets the text of the sync job stream.
- * @member {string} [value] Gets the value of the sync job stream.
+ * @member {string} [name] Gets or sets the name of the extension handler.
+ * @member {string} [version] Gets or sets the version of the extension
+ * handler.
  */
-export interface SourceControlSyncJobStreamById {
-  readonly id?: string;
-  syncJobStreamId?: string;
-  summary?: string;
-  readonly time?: Date;
-  streamType?: string;
-  streamText?: string;
-  value?: string;
+export interface DscNodeExtensionHandlerAssociationProperty {
+  name?: string;
+  version?: string;
 }
 
 /**
@@ -3015,6 +2839,129 @@ export interface DscNode extends ProxyResource {
   extensionHandler?: DscNodeExtensionHandlerAssociationProperty[];
 }
 
+/**
+ * @class
+ * Initializes a new instance of the AgentRegistrationRegenerateKeyParameter class.
+ * @constructor
+ * The parameters supplied to the regenerate keys operation.
+ *
+ * @member {string} keyName Gets or sets the agent registration key name -
+ * primary or secondary. Possible values include: 'primary', 'secondary'
+ */
+export interface AgentRegistrationRegenerateKeyParameter {
+  keyName: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the DscNodeUpdateParametersProperties class.
+ * @constructor
+ * @member {string} [name] Gets or sets the name of the dsc nodeconfiguration.
+ */
+export interface DscNodeUpdateParametersProperties {
+  name?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the DscNodeUpdateParameters class.
+ * @constructor
+ * The parameters supplied to the update dsc node operation.
+ *
+ * @member {string} [nodeId] Gets or sets the id of the dsc node.
+ * @member {object} [properties]
+ * @member {string} [properties.name] Gets or sets the name of the dsc
+ * nodeconfiguration.
+ */
+export interface DscNodeUpdateParameters {
+  nodeId?: string;
+  properties?: DscNodeUpdateParametersProperties;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the DscConfigurationAssociationProperty class.
+ * @constructor
+ * The Dsc configuration property associated with the entity.
+ *
+ * @member {string} [name] Gets or sets the name of the Dsc configuration.
+ */
+export interface DscConfigurationAssociationProperty {
+  name?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the DscCompilationJob class.
+ * @constructor
+ * Definition of the Dsc Compilation job.
+ *
+ * @member {object} [configuration] Gets or sets the configuration.
+ * @member {string} [configuration.name] Gets or sets the name of the Dsc
+ * configuration.
+ * @member {string} [startedBy] Gets the compilation job started by.
+ * @member {uuid} [jobId] Gets the id of the job.
+ * @member {date} [creationTime] Gets the creation time of the job.
+ * @member {string} [provisioningState] The current provisioning state of the
+ * job. Possible values include: 'Failed', 'Succeeded', 'Suspended',
+ * 'Processing'
+ * @member {string} [runOn] Gets or sets the runOn which specifies the group
+ * name where the job is to be executed.
+ * @member {string} [status] Gets or sets the status of the job. Possible
+ * values include: 'New', 'Activating', 'Running', 'Completed', 'Failed',
+ * 'Stopped', 'Blocked', 'Suspended', 'Disconnected', 'Suspending', 'Stopping',
+ * 'Resuming', 'Removing'
+ * @member {string} [statusDetails] Gets or sets the status details of the job.
+ * @member {date} [startTime] Gets the start time of the job.
+ * @member {date} [endTime] Gets the end time of the job.
+ * @member {string} [exception] Gets the exception of the job.
+ * @member {date} [lastModifiedTime] Gets the last modified time of the job.
+ * @member {date} [lastStatusModifiedTime] Gets the last status modified time
+ * of the job.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ */
+export interface DscCompilationJob extends ProxyResource {
+  configuration?: DscConfigurationAssociationProperty;
+  readonly startedBy?: string;
+  readonly jobId?: string;
+  readonly creationTime?: Date;
+  provisioningState?: string;
+  runOn?: string;
+  status?: string;
+  statusDetails?: string;
+  readonly startTime?: Date;
+  readonly endTime?: Date;
+  readonly exception?: string;
+  readonly lastModifiedTime?: Date;
+  readonly lastStatusModifiedTime?: Date;
+  parameters?: { [propertyName: string]: string };
+}
+
+/**
+ * @class
+ * Initializes a new instance of the DscCompilationJobCreateParameters class.
+ * @constructor
+ * The parameters supplied to the create compilation job operation.
+ *
+ * @member {object} configuration Gets or sets the configuration.
+ * @member {string} [configuration.name] Gets or sets the name of the Dsc
+ * configuration.
+ * @member {object} [parameters] Gets or sets the parameters of the job.
+ * @member {boolean} [incrementNodeConfigurationBuild] If a new build version
+ * of NodeConfiguration is required.
+ * @member {string} [name] Gets or sets name of the resource.
+ * @member {string} [location] Gets or sets the location of the resource.
+ * @member {object} [tags] Gets or sets the tags attached to the resource.
+ */
+export interface DscCompilationJobCreateParameters {
+  configuration: DscConfigurationAssociationProperty;
+  parameters?: { [propertyName: string]: string };
+  incrementNodeConfigurationBuild?: boolean;
+  name?: string;
+  location?: string;
+  tags?: { [propertyName: string]: string };
+}
+
 /**
  * @class
  * Initializes a new instance of the DscNodeConfiguration class.
@@ -3075,6 +3022,54 @@ export interface DscNodeConfigurationCreateOrUpdateParameters {
   tags?: { [propertyName: string]: string };
 }
 
+/**
+ * @class
+ * Initializes a new instance of the Watcher class.
+ * @constructor
+ * Definition of the watcher type.
+ *
+ * @member {number} [executionFrequencyInSeconds] Gets or sets the frequency at
+ * which the watcher is invoked.
+ * @member {string} [scriptName] Gets or sets the name of the script the
+ * watcher is attached to, i.e. the name of an existing runbook.
+ * @member {object} [scriptParameters] Gets or sets the parameters of the
+ * script.
+ * @member {string} [scriptRunOn] Gets or sets the name of the hybrid worker
+ * group the watcher will run on.
+ * @member {string} [status] Gets the current status of the watcher.
+ * @member {date} [creationTime] Gets or sets the creation time.
+ * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+ * @member {string} [lastModifiedBy] Details of the user who last modified the
+ * watcher.
+ * @member {string} [description] Gets or sets the description.
+ * @member {string} [etag] Gets or sets the etag of the resource.
+ */
+export interface Watcher extends TrackedResource {
+  executionFrequencyInSeconds?: number;
+  scriptName?: string;
+  scriptParameters?: { [propertyName: string]: string };
+  scriptRunOn?: string;
+  readonly status?: string;
+  readonly creationTime?: Date;
+  readonly lastModifiedTime?: Date;
+  readonly lastModifiedBy?: string;
+  description?: string;
+  etag?: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the WatcherUpdateParameters class.
+ * @constructor
+ * @member {number} [executionFrequencyInSeconds] Gets or sets the frequency at
+ * which the watcher is invoked.
+ * @member {string} [name] Gets or sets the name of the resource.
+ */
+export interface WatcherUpdateParameters {
+  executionFrequencyInSeconds?: number;
+  name?: string;
+}
+
 
 /**
  * @class
@@ -3118,14 +3113,6 @@ export interface StatisticsListResult extends Array<Statistics> {
 export interface UsageListResult extends Array<Usage> {
 }
 
-/**
- * @class
- * Initializes a new instance of the KeyListResult class.
- * @constructor
- */
-export interface KeyListResult extends Array<Key> {
-}
-
 /**
  * @class
  * Initializes a new instance of the CertificateListResult class.
@@ -3404,3 +3391,15 @@ export interface DscCompilationJobListResult extends Array<DscCompilationJob> {
 export interface DscNodeConfigurationListResult extends Array<DscNodeConfiguration> {
   nextLink?: string;
 }
+
+/**
+ * @class
+ * Initializes a new instance of the WatcherListResult class.
+ * @constructor
+ * The response model for the list watcher operation.
+ *
+ * @member {string} [nextLink] Gets or sets the next link.
+ */
+export interface WatcherListResult extends Array<Watcher> {
+  nextLink?: string;
+}
diff --git a/lib/services/automationManagement/lib/models/index.js b/lib/services/automationManagement/lib/models/index.js
index 2676638dbd..d5aa5017e5 100644
--- a/lib/services/automationManagement/lib/models/index.js
+++ b/lib/services/automationManagement/lib/models/index.js
@@ -19,100 +19,81 @@ var msRestAzure = require('ms-rest-azure');
 exports.BaseResource = msRestAzure.BaseResource;
 exports.CloudError = msRestAzure.CloudError;
 exports.ErrorResponse = require('./errorResponse');
-exports.Key = require('./key');
-exports.UsageCounterName = require('./usageCounterName');
-exports.Usage = require('./usage');
-exports.Statistics = require('./statistics');
-exports.RunbookAssociationProperty = require('./runbookAssociationProperty');
 exports.Resource = require('./resource');
-exports.ProxyResource = require('./proxyResource');
-exports.Webhook = require('./webhook');
-exports.Variable = require('./variable');
-exports.JobProvisioningStateProperty = require('./jobProvisioningStateProperty');
-exports.DscConfigurationAssociationProperty = require('./dscConfigurationAssociationProperty');
-exports.DscCompilationJob = require('./dscCompilationJob');
-exports.Credential = require('./credential');
-exports.ConnectionTypeAssociationProperty = require('./connectionTypeAssociationProperty');
-exports.Connection = require('./connection');
-exports.Certificate = require('./certificate');
-exports.RunbookParameter = require('./runbookParameter');
-exports.ContentHash = require('./contentHash');
-exports.ContentLink = require('./contentLink');
-exports.RunbookDraft = require('./runbookDraft');
 exports.TrackedResource = require('./trackedResource');
-exports.Runbook = require('./runbook');
-exports.ModuleErrorInfo = require('./moduleErrorInfo');
-exports.Module = require('./module');
-exports.ContentSource = require('./contentSource');
-exports.DscConfigurationParameter = require('./dscConfigurationParameter');
-exports.DscConfiguration = require('./dscConfiguration');
+exports.ProxyResource = require('./proxyResource');
 exports.Sku = require('./sku');
 exports.AutomationAccount = require('./automationAccount');
+exports.AutomationAccountCreateOrUpdateParameters = require('./automationAccountCreateOrUpdateParameters');
 exports.OperationDisplay = require('./operationDisplay');
 exports.Operation = require('./operation');
-exports.AutomationAccountCreateOrUpdateParameters = require('./automationAccountCreateOrUpdateParameters');
+exports.Statistics = require('./statistics');
+exports.UsageCounterName = require('./usageCounterName');
+exports.Usage = require('./usage');
+exports.Key = require('./key');
+exports.KeyListResult = require('./keyListResult');
 exports.AutomationAccountUpdateParameters = require('./automationAccountUpdateParameters');
-exports.CertificateUpdateParameters = require('./certificateUpdateParameters');
 exports.CertificateCreateOrUpdateParameters = require('./certificateCreateOrUpdateParameters');
-exports.ConnectionUpdateParameters = require('./connectionUpdateParameters');
+exports.Certificate = require('./certificate');
+exports.CertificateUpdateParameters = require('./certificateUpdateParameters');
+exports.ConnectionTypeAssociationProperty = require('./connectionTypeAssociationProperty');
 exports.ConnectionCreateOrUpdateParameters = require('./connectionCreateOrUpdateParameters');
+exports.Connection = require('./connection');
+exports.ConnectionUpdateParameters = require('./connectionUpdateParameters');
 exports.FieldDefinition = require('./fieldDefinition');
 exports.ConnectionType = require('./connectionType');
 exports.ConnectionTypeCreateOrUpdateParameters = require('./connectionTypeCreateOrUpdateParameters');
-exports.CredentialUpdateParameters = require('./credentialUpdateParameters');
 exports.CredentialCreateOrUpdateParameters = require('./credentialCreateOrUpdateParameters');
-exports.ActivityParameter = require('./activityParameter');
-exports.ActivityParameterSet = require('./activityParameterSet');
-exports.ActivityOutputType = require('./activityOutputType');
-exports.Activity = require('./activity');
-exports.AdvancedScheduleMonthlyOccurrence = require('./advancedScheduleMonthlyOccurrence');
-exports.AdvancedSchedule = require('./advancedSchedule');
-exports.AgentRegistrationKeys = require('./agentRegistrationKeys');
-exports.AgentRegistration = require('./agentRegistration');
-exports.AgentRegistrationRegenerateKeyParameter = require('./agentRegistrationRegenerateKeyParameter');
-exports.DscCompilationJobCreateParameters = require('./dscCompilationJobCreateParameters');
-exports.JobStream = require('./jobStream');
+exports.Credential = require('./credential');
+exports.CredentialUpdateParameters = require('./credentialUpdateParameters');
+exports.ContentHash = require('./contentHash');
+exports.ContentSource = require('./contentSource');
+exports.DscConfigurationParameter = require('./dscConfigurationParameter');
 exports.DscConfigurationCreateOrUpdateParameters = require('./dscConfigurationCreateOrUpdateParameters');
+exports.DscConfiguration = require('./dscConfiguration');
 exports.DscConfigurationUpdateParameters = require('./dscConfigurationUpdateParameters');
-exports.DscMetaConfiguration = require('./dscMetaConfiguration');
-exports.DscNodeConfigurationAssociationProperty = require('./dscNodeConfigurationAssociationProperty');
-exports.DscNodeExtensionHandlerAssociationProperty = require('./dscNodeExtensionHandlerAssociationProperty');
-exports.DscNodeUpdateParametersProperties = require('./dscNodeUpdateParametersProperties');
-exports.DscNodeUpdateParameters = require('./dscNodeUpdateParameters');
-exports.DscReportError = require('./dscReportError');
-exports.DscReportResourceNavigation = require('./dscReportResourceNavigation');
-exports.DscReportResource = require('./dscReportResource');
-exports.DscNodeReport = require('./dscNodeReport');
-exports.HybridRunbookWorker = require('./hybridRunbookWorker');
 exports.RunAsCredentialAssociationProperty = require('./runAsCredentialAssociationProperty');
+exports.HybridRunbookWorker = require('./hybridRunbookWorker');
 exports.HybridRunbookWorkerGroup = require('./hybridRunbookWorkerGroup');
 exports.HybridRunbookWorkerGroupUpdateParameters = require('./hybridRunbookWorkerGroupUpdateParameters');
 exports.ScheduleAssociationProperty = require('./scheduleAssociationProperty');
-exports.JobScheduleCreateParameters = require('./jobScheduleCreateParameters');
+exports.RunbookAssociationProperty = require('./runbookAssociationProperty');
 exports.JobSchedule = require('./jobSchedule');
+exports.JobScheduleCreateParameters = require('./jobScheduleCreateParameters');
 exports.LinkedWorkspace = require('./linkedWorkspace');
+exports.ActivityParameter = require('./activityParameter');
+exports.ActivityParameterSet = require('./activityParameterSet');
+exports.ActivityOutputType = require('./activityOutputType');
+exports.Activity = require('./activity');
+exports.ModuleErrorInfo = require('./moduleErrorInfo');
+exports.ContentLink = require('./contentLink');
+exports.Module = require('./module');
 exports.ModuleCreateOrUpdateParameters = require('./moduleCreateOrUpdateParameters');
 exports.ModuleUpdateParameters = require('./moduleUpdateParameters');
-exports.RunbookDraftUndoEditResult = require('./runbookDraftUndoEditResult');
+exports.TypeField = require('./typeField');
+exports.JobStream = require('./jobStream');
+exports.RunbookParameter = require('./runbookParameter');
+exports.RunbookDraft = require('./runbookDraft');
+exports.Runbook = require('./runbook');
 exports.RunbookCreateOrUpdateParameters = require('./runbookCreateOrUpdateParameters');
+exports.RunbookUpdateParameters = require('./runbookUpdateParameters');
+exports.RunbookDraftUndoEditResult = require('./runbookDraftUndoEditResult');
+exports.TestJobCreateParameters = require('./testJobCreateParameters');
+exports.TestJob = require('./testJob');
 exports.RunbookCreateOrUpdateDraftProperties = require('./runbookCreateOrUpdateDraftProperties');
 exports.RunbookCreateOrUpdateDraftParameters = require('./runbookCreateOrUpdateDraftParameters');
-exports.RunbookUpdateParameters = require('./runbookUpdateParameters');
+exports.AdvancedScheduleMonthlyOccurrence = require('./advancedScheduleMonthlyOccurrence');
+exports.AdvancedSchedule = require('./advancedSchedule');
 exports.ScheduleCreateOrUpdateParameters = require('./scheduleCreateOrUpdateParameters');
 exports.ScheduleProperties = require('./scheduleProperties');
 exports.Schedule = require('./schedule');
 exports.ScheduleUpdateParameters = require('./scheduleUpdateParameters');
-exports.SubResource = require('./subResource');
-exports.TestJobCreateParameters = require('./testJobCreateParameters');
-exports.TestJob = require('./testJob');
-exports.TypeField = require('./typeField');
 exports.VariableCreateOrUpdateParameters = require('./variableCreateOrUpdateParameters');
+exports.Variable = require('./variable');
 exports.VariableUpdateParameters = require('./variableUpdateParameters');
-exports.WebhookCreateOrUpdateParameters = require('./webhookCreateOrUpdateParameters');
+exports.Webhook = require('./webhook');
 exports.WebhookUpdateParameters = require('./webhookUpdateParameters');
-exports.Job = require('./job');
-exports.JobCollectionItem = require('./jobCollectionItem');
-exports.JobCreateParameters = require('./jobCreateParameters');
+exports.WebhookCreateOrUpdateParameters = require('./webhookCreateOrUpdateParameters');
 exports.WindowsProperties = require('./windowsProperties');
 exports.LinuxProperties = require('./linuxProperties');
 exports.UpdateConfiguration = require('./updateConfiguration');
@@ -121,27 +102,45 @@ exports.CollectionItemUpdateConfiguration = require('./collectionItemUpdateConfi
 exports.SoftwareUpdateConfigurationCollectionItem = require('./softwareUpdateConfigurationCollectionItem');
 exports.SoftwareUpdateConfigurationListResult = require('./softwareUpdateConfigurationListResult');
 exports.UpdateConfigurationNavigation = require('./updateConfigurationNavigation');
-exports.JobNavigation = require('./jobNavigation');
 exports.SoftwareUpdateConfigurationRun = require('./softwareUpdateConfigurationRun');
 exports.SoftwareUpdateConfigurationRunListResult = require('./softwareUpdateConfigurationRunListResult');
+exports.JobNavigation = require('./jobNavigation');
 exports.SoftwareUpdateConfigurationMachineRun = require('./softwareUpdateConfigurationMachineRun');
 exports.SoftwareUpdateConfigurationMachineRunListResult = require('./softwareUpdateConfigurationMachineRunListResult');
-exports.SourceControlCreateOrUpdateParameters = require('./sourceControlCreateOrUpdateParameters');
 exports.SourceControl = require('./sourceControl');
 exports.SourceControlUpdateParameters = require('./sourceControlUpdateParameters');
+exports.SourceControlCreateOrUpdateParameters = require('./sourceControlCreateOrUpdateParameters');
 exports.SourceControlSyncJob = require('./sourceControlSyncJob');
 exports.SourceControlSyncJobCreateParameters = require('./sourceControlSyncJobCreateParameters');
 exports.SourceControlSyncJobById = require('./sourceControlSyncJobById');
 exports.SourceControlSyncJobStream = require('./sourceControlSyncJobStream');
 exports.SourceControlSyncJobStreamById = require('./sourceControlSyncJobStreamById');
+exports.Job = require('./job');
+exports.JobCollectionItem = require('./jobCollectionItem');
+exports.JobCreateParameters = require('./jobCreateParameters');
+exports.DscReportError = require('./dscReportError');
+exports.DscReportResourceNavigation = require('./dscReportResourceNavigation');
+exports.DscReportResource = require('./dscReportResource');
+exports.DscMetaConfiguration = require('./dscMetaConfiguration');
+exports.DscNodeReport = require('./dscNodeReport');
+exports.AgentRegistrationKeys = require('./agentRegistrationKeys');
+exports.AgentRegistration = require('./agentRegistration');
+exports.DscNodeExtensionHandlerAssociationProperty = require('./dscNodeExtensionHandlerAssociationProperty');
 exports.DscNode = require('./dscNode');
+exports.AgentRegistrationRegenerateKeyParameter = require('./agentRegistrationRegenerateKeyParameter');
+exports.DscNodeUpdateParametersProperties = require('./dscNodeUpdateParametersProperties');
+exports.DscNodeUpdateParameters = require('./dscNodeUpdateParameters');
+exports.DscConfigurationAssociationProperty = require('./dscConfigurationAssociationProperty');
+exports.DscCompilationJob = require('./dscCompilationJob');
+exports.DscCompilationJobCreateParameters = require('./dscCompilationJobCreateParameters');
 exports.DscNodeConfiguration = require('./dscNodeConfiguration');
 exports.DscNodeConfigurationCreateOrUpdateParameters = require('./dscNodeConfigurationCreateOrUpdateParameters');
+exports.Watcher = require('./watcher');
+exports.WatcherUpdateParameters = require('./watcherUpdateParameters');
 exports.AutomationAccountListResult = require('./automationAccountListResult');
 exports.OperationListResult = require('./operationListResult');
 exports.StatisticsListResult = require('./statisticsListResult');
 exports.UsageListResult = require('./usageListResult');
-exports.KeyListResult = require('./keyListResult');
 exports.CertificateListResult = require('./certificateListResult');
 exports.ConnectionListResult = require('./connectionListResult');
 exports.ConnectionTypeListResult = require('./connectionTypeListResult');
@@ -165,3 +164,4 @@ exports.DscNodeListResult = require('./dscNodeListResult');
 exports.DscNodeReportListResult = require('./dscNodeReportListResult');
 exports.DscCompilationJobListResult = require('./dscCompilationJobListResult');
 exports.DscNodeConfigurationListResult = require('./dscNodeConfigurationListResult');
+exports.WatcherListResult = require('./watcherListResult');
diff --git a/lib/services/automationManagement/lib/models/job.js b/lib/services/automationManagement/lib/models/job.js
index c0759250d5..d3d2383b14 100644
--- a/lib/services/automationManagement/lib/models/job.js
+++ b/lib/services/automationManagement/lib/models/job.js
@@ -41,7 +41,9 @@ class Job extends models['ProxyResource'] {
    * @member {date} [lastStatusModifiedTime] Gets or sets the last status
    * modified time of the job.
    * @member {object} [parameters] Gets or sets the parameters of the job.
-   * @member {string} [provisioningState] The provisioning state of a resource.
+   * @member {string} [provisioningState] The current provisioning state of the
+   * job. Possible values include: 'Failed', 'Succeeded', 'Suspended',
+   * 'Processing'
    */
   constructor() {
     super();
@@ -186,7 +188,6 @@ class Job extends models['ProxyResource'] {
           },
           provisioningState: {
             required: false,
-            readOnly: true,
             serializedName: 'properties.provisioningState',
             type: {
               name: 'String'
diff --git a/lib/services/automationManagement/lib/models/jobSchedule.js b/lib/services/automationManagement/lib/models/jobSchedule.js
index f608fc5495..aa9031c84d 100644
--- a/lib/services/automationManagement/lib/models/jobSchedule.js
+++ b/lib/services/automationManagement/lib/models/jobSchedule.js
@@ -24,7 +24,7 @@ class JobSchedule {
    * @member {string} [type] Resource type
    * @member {string} [jobScheduleId] Gets or sets the id of job schedule.
    * @member {object} [schedule] Gets or sets the schedule.
-   * @member {string} [schedule.name] Gets or sets the name of the schedule.
+   * @member {string} [schedule.name] Gets or sets the name of the Schedule.
    * @member {object} [runbook] Gets or sets the runbook.
    * @member {string} [runbook.name] Gets or sets the name of the runbook.
    * @member {string} [runOn] Gets or sets the hybrid worker group that the
diff --git a/lib/services/automationManagement/lib/models/jobScheduleCreateParameters.js b/lib/services/automationManagement/lib/models/jobScheduleCreateParameters.js
index f49878f3f3..82bb1dd5aa 100644
--- a/lib/services/automationManagement/lib/models/jobScheduleCreateParameters.js
+++ b/lib/services/automationManagement/lib/models/jobScheduleCreateParameters.js
@@ -20,7 +20,7 @@ class JobScheduleCreateParameters {
   /**
    * Create a JobScheduleCreateParameters.
    * @member {object} schedule Gets or sets the schedule.
-   * @member {string} [schedule.name] Gets or sets the name of the schedule.
+   * @member {string} [schedule.name] Gets or sets the name of the Schedule.
    * @member {object} runbook Gets or sets the runbook.
    * @member {string} [runbook.name] Gets or sets the name of the runbook.
    * @member {string} [runOn] Gets or sets the hybrid worker group that the
diff --git a/lib/services/automationManagement/lib/models/key.js b/lib/services/automationManagement/lib/models/key.js
index 95e57f9318..81d97e79ac 100644
--- a/lib/services/automationManagement/lib/models/key.js
+++ b/lib/services/automationManagement/lib/models/key.js
@@ -18,9 +18,9 @@ class Key {
   /**
    * Create a Key.
    * @member {string} [keyName] Automation key name. Possible values include:
-   * 'primary', 'secondary'
+   * 'Primary', 'Secondary'
    * @member {string} [permissions] Automation key permissions. Possible values
-   * include: 'Full'
+   * include: 'Read', 'Full'
    * @member {string} [value] Value of the Automation Key used for
    * registration.
    */
@@ -43,21 +43,24 @@ class Key {
         modelProperties: {
           keyName: {
             required: false,
-            serializedName: 'keyName',
+            readOnly: true,
+            serializedName: 'KeyName',
             type: {
               name: 'String'
             }
           },
           permissions: {
             required: false,
-            serializedName: 'permissions',
+            readOnly: true,
+            serializedName: 'Permissions',
             type: {
               name: 'String'
             }
           },
           value: {
             required: false,
-            serializedName: 'value',
+            readOnly: true,
+            serializedName: 'Value',
             type: {
               name: 'String'
             }
diff --git a/lib/services/automationManagement/lib/models/keyListResult.js b/lib/services/automationManagement/lib/models/keyListResult.js
index 3bacb69713..80b209d443 100644
--- a/lib/services/automationManagement/lib/models/keyListResult.js
+++ b/lib/services/automationManagement/lib/models/keyListResult.js
@@ -10,15 +10,17 @@
 
 'use strict';
 
+const models = require('./index');
+
 /**
  * Class representing a KeyListResult.
  */
-class KeyListResult extends Array {
+class KeyListResult {
   /**
    * Create a KeyListResult.
+   * @member {array} [keys] Lists the automation keys.
    */
   constructor() {
-    super();
   }
 
   /**
@@ -35,9 +37,9 @@ class KeyListResult extends Array {
         name: 'Composite',
         className: 'KeyListResult',
         modelProperties: {
-          value: {
+          keys: {
             required: false,
-            serializedName: '',
+            serializedName: 'keys',
             type: {
               name: 'Sequence',
               element: {
diff --git a/lib/services/automationManagement/lib/models/proxyResource.js b/lib/services/automationManagement/lib/models/proxyResource.js
index 43e93ec60e..4ea685046e 100644
--- a/lib/services/automationManagement/lib/models/proxyResource.js
+++ b/lib/services/automationManagement/lib/models/proxyResource.js
@@ -13,8 +13,7 @@
 const models = require('./index');
 
 /**
- * The resource model definition for a ARM proxy resource. It will have
- * everything other than required location and tags
+ * ARM proxy resource.
  *
  * @extends models['Resource']
  */
diff --git a/lib/services/automationManagement/lib/models/runbookDraft.js b/lib/services/automationManagement/lib/models/runbookDraft.js
index 06c864d39d..66c9744325 100644
--- a/lib/services/automationManagement/lib/models/runbookDraft.js
+++ b/lib/services/automationManagement/lib/models/runbookDraft.js
@@ -13,8 +13,7 @@
 const models = require('./index');
 
 /**
- * Definition of the runbook type.
- *
+ * Class representing a RunbookDraft.
  */
 class RunbookDraft {
   /**
diff --git a/lib/services/automationManagement/lib/models/schedule.js b/lib/services/automationManagement/lib/models/schedule.js
index 37dbafbc93..3bca6b1bf9 100644
--- a/lib/services/automationManagement/lib/models/schedule.js
+++ b/lib/services/automationManagement/lib/models/schedule.js
@@ -15,13 +15,11 @@ const models = require('./index');
 /**
  * Definition of the schedule.
  *
+ * @extends models['ProxyResource']
  */
-class Schedule {
+class Schedule extends models['ProxyResource'] {
   /**
    * Create a Schedule.
-   * @member {string} [id] Gets the id of the resource.
-   * @member {string} [name] Gets name of the schedule.
-   * @member {string} [type] Resource type
    * @member {date} [startTime] Gets or sets the start time of the schedule.
    * @member {number} [startTimeOffsetMinutes] Gets the start time's offset in
    * minutes.
@@ -49,6 +47,7 @@ class Schedule {
    * @member {string} [description] Gets or sets the description.
    */
   constructor() {
+    super();
   }
 
   /**
diff --git a/lib/services/automationManagement/lib/models/scheduleAssociationProperty.js b/lib/services/automationManagement/lib/models/scheduleAssociationProperty.js
index a21c31f50d..fc7db44a05 100644
--- a/lib/services/automationManagement/lib/models/scheduleAssociationProperty.js
+++ b/lib/services/automationManagement/lib/models/scheduleAssociationProperty.js
@@ -17,7 +17,7 @@
 class ScheduleAssociationProperty {
   /**
    * Create a ScheduleAssociationProperty.
-   * @member {string} [name] Gets or sets the name of the schedule.
+   * @member {string} [name] Gets or sets the name of the Schedule.
    */
   constructor() {
   }
diff --git a/lib/services/automationManagement/lib/models/scheduleCreateOrUpdateParameters.js b/lib/services/automationManagement/lib/models/scheduleCreateOrUpdateParameters.js
index fd14a76bd3..dc6652e40b 100644
--- a/lib/services/automationManagement/lib/models/scheduleCreateOrUpdateParameters.js
+++ b/lib/services/automationManagement/lib/models/scheduleCreateOrUpdateParameters.js
@@ -19,7 +19,7 @@ const models = require('./index');
 class ScheduleCreateOrUpdateParameters {
   /**
    * Create a ScheduleCreateOrUpdateParameters.
-   * @member {string} name Gets or sets the name of the schedule.
+   * @member {string} name Gets or sets the name of the Schedule.
    * @member {string} [description] Gets or sets the description of the
    * schedule.
    * @member {date} startTime Gets or sets the start time of the schedule.
diff --git a/lib/services/automationManagement/lib/models/scheduleUpdateParameters.js b/lib/services/automationManagement/lib/models/scheduleUpdateParameters.js
index 26bd642bec..65268c3287 100644
--- a/lib/services/automationManagement/lib/models/scheduleUpdateParameters.js
+++ b/lib/services/automationManagement/lib/models/scheduleUpdateParameters.js
@@ -17,7 +17,7 @@
 class ScheduleUpdateParameters {
   /**
    * Create a ScheduleUpdateParameters.
-   * @member {string} [name] Gets or sets the name of the schedule.
+   * @member {string} [name] Gets or sets the name of the Schedule.
    * @member {string} [description] Gets or sets the description of the
    * schedule.
    * @member {boolean} [isEnabled] Gets or sets a value indicating whether this
diff --git a/lib/services/automationManagement/lib/models/sourceControl.js b/lib/services/automationManagement/lib/models/sourceControl.js
index b926558d2e..eeedff4348 100644
--- a/lib/services/automationManagement/lib/models/sourceControl.js
+++ b/lib/services/automationManagement/lib/models/sourceControl.js
@@ -15,14 +15,11 @@ const models = require('./index');
 /**
  * Definition of the source control.
  *
- * @extends models['BaseResource']
+ * @extends models['ProxyResource']
  */
-class SourceControl extends models['BaseResource'] {
+class SourceControl extends models['ProxyResource'] {
   /**
    * Create a SourceControl.
-   * @member {string} [name] Resource name.
-   * @member {string} [id] Resource Id.
-   * @member {string} [type] Resource type.
    * @member {string} [repoUrl] Gets or sets the repo url of the source
    * control.
    * @member {string} [branch] Gets or sets the repo branch of the source
@@ -57,18 +54,18 @@ class SourceControl extends models['BaseResource'] {
         name: 'Composite',
         className: 'SourceControl',
         modelProperties: {
-          name: {
+          id: {
             required: false,
             readOnly: true,
-            serializedName: 'name',
+            serializedName: 'id',
             type: {
               name: 'String'
             }
           },
-          id: {
+          name: {
             required: false,
             readOnly: true,
-            serializedName: 'id',
+            serializedName: 'name',
             type: {
               name: 'String'
             }
diff --git a/lib/services/automationManagement/lib/models/watcher.js b/lib/services/automationManagement/lib/models/watcher.js
new file mode 100644
index 0000000000..39671ec978
--- /dev/null
+++ b/lib/services/automationManagement/lib/models/watcher.js
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Definition of the watcher type.
+ *
+ * @extends models['TrackedResource']
+ */
+class Watcher extends models['TrackedResource'] {
+  /**
+   * Create a Watcher.
+   * @member {number} [executionFrequencyInSeconds] Gets or sets the frequency
+   * at which the watcher is invoked.
+   * @member {string} [scriptName] Gets or sets the name of the script the
+   * watcher is attached to, i.e. the name of an existing runbook.
+   * @member {object} [scriptParameters] Gets or sets the parameters of the
+   * script.
+   * @member {string} [scriptRunOn] Gets or sets the name of the hybrid worker
+   * group the watcher will run on.
+   * @member {string} [status] Gets the current status of the watcher.
+   * @member {date} [creationTime] Gets or sets the creation time.
+   * @member {date} [lastModifiedTime] Gets or sets the last modified time.
+   * @member {string} [lastModifiedBy] Details of the user who last modified
+   * the watcher.
+   * @member {string} [description] Gets or sets the description.
+   * @member {string} [etag] Gets or sets the etag of the resource.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of Watcher
+   *
+   * @returns {object} metadata of Watcher
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'Watcher',
+      type: {
+        name: 'Composite',
+        className: 'Watcher',
+        modelProperties: {
+          id: {
+            required: false,
+            readOnly: true,
+            serializedName: 'id',
+            type: {
+              name: 'String'
+            }
+          },
+          name: {
+            required: false,
+            readOnly: true,
+            serializedName: 'name',
+            type: {
+              name: 'String'
+            }
+          },
+          type: {
+            required: false,
+            readOnly: true,
+            serializedName: 'type',
+            type: {
+              name: 'String'
+            }
+          },
+          tags: {
+            required: false,
+            serializedName: 'tags',
+            type: {
+              name: 'Dictionary',
+              value: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          location: {
+            required: false,
+            serializedName: 'location',
+            type: {
+              name: 'String'
+            }
+          },
+          executionFrequencyInSeconds: {
+            required: false,
+            serializedName: 'properties.executionFrequencyInSeconds',
+            type: {
+              name: 'Number'
+            }
+          },
+          scriptName: {
+            required: false,
+            serializedName: 'properties.scriptName',
+            type: {
+              name: 'String'
+            }
+          },
+          scriptParameters: {
+            required: false,
+            serializedName: 'properties.scriptParameters',
+            type: {
+              name: 'Dictionary',
+              value: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          scriptRunOn: {
+            required: false,
+            serializedName: 'properties.scriptRunOn',
+            type: {
+              name: 'String'
+            }
+          },
+          status: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.status',
+            type: {
+              name: 'String'
+            }
+          },
+          creationTime: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.creationTime',
+            type: {
+              name: 'DateTime'
+            }
+          },
+          lastModifiedTime: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.lastModifiedTime',
+            type: {
+              name: 'DateTime'
+            }
+          },
+          lastModifiedBy: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.lastModifiedBy',
+            type: {
+              name: 'String'
+            }
+          },
+          description: {
+            required: false,
+            serializedName: 'properties.description',
+            type: {
+              name: 'String'
+            }
+          },
+          etag: {
+            required: false,
+            serializedName: 'etag',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = Watcher;
diff --git a/lib/services/automationManagement/lib/models/watcherListResult.js b/lib/services/automationManagement/lib/models/watcherListResult.js
new file mode 100644
index 0000000000..c900c0ef28
--- /dev/null
+++ b/lib/services/automationManagement/lib/models/watcherListResult.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The response model for the list watcher operation.
+ */
+class WatcherListResult extends Array {
+  /**
+   * Create a WatcherListResult.
+   * @member {string} [nextLink] Gets or sets the next link.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of WatcherListResult
+   *
+   * @returns {object} metadata of WatcherListResult
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'WatcherListResult',
+      type: {
+        name: 'Composite',
+        className: 'WatcherListResult',
+        modelProperties: {
+          value: {
+            required: false,
+            serializedName: '',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'WatcherElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'Watcher'
+                  }
+              }
+            }
+          },
+          nextLink: {
+            required: false,
+            serializedName: 'nextLink',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = WatcherListResult;
diff --git a/lib/services/automationManagement/lib/models/watcherUpdateParameters.js b/lib/services/automationManagement/lib/models/watcherUpdateParameters.js
new file mode 100644
index 0000000000..30671293e8
--- /dev/null
+++ b/lib/services/automationManagement/lib/models/watcherUpdateParameters.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * Class representing a WatcherUpdateParameters.
+ */
+class WatcherUpdateParameters {
+  /**
+   * Create a WatcherUpdateParameters.
+   * @member {number} [executionFrequencyInSeconds] Gets or sets the frequency
+   * at which the watcher is invoked.
+   * @member {string} [name] Gets or sets the name of the resource.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of WatcherUpdateParameters
+   *
+   * @returns {object} metadata of WatcherUpdateParameters
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'WatcherUpdateParameters',
+      type: {
+        name: 'Composite',
+        className: 'WatcherUpdateParameters',
+        modelProperties: {
+          executionFrequencyInSeconds: {
+            required: false,
+            serializedName: 'properties.executionFrequencyInSeconds',
+            type: {
+              name: 'Number'
+            }
+          },
+          name: {
+            required: false,
+            serializedName: 'name',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = WatcherUpdateParameters;
diff --git a/lib/services/automationManagement/lib/operations/activityOperations.js b/lib/services/automationManagement/lib/operations/activityOperations.js
index e7697d5ced..9d46756827 100644
--- a/lib/services/automationManagement/lib/operations/activityOperations.js
+++ b/lib/services/automationManagement/lib/operations/activityOperations.js
@@ -20,7 +20,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -190,7 +190,7 @@ function _get(resourceGroupName, automationAccountName, moduleName, activityName
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -496,7 +496,7 @@ class ActivityOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -533,7 +533,7 @@ class ActivityOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -591,7 +591,7 @@ class ActivityOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -625,7 +625,7 @@ class ActivityOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
diff --git a/lib/services/automationManagement/lib/operations/agentRegistrationInformation.js b/lib/services/automationManagement/lib/operations/agentRegistrationInformation.js
index 87214db0dd..1be508946f 100644
--- a/lib/services/automationManagement/lib/operations/agentRegistrationInformation.js
+++ b/lib/services/automationManagement/lib/operations/agentRegistrationInformation.js
@@ -185,14 +185,6 @@ function _get(resourceGroupName, automationAccountName, options, callback) {
  * @param {string} parameters.keyName Gets or sets the agent registration key
  * name - primary or secondary. Possible values include: 'primary', 'secondary'
  *
- * @param {string} [parameters.name] Gets or sets the name of the resource.
- *
- * @param {string} [parameters.location] Gets or sets the location of the
- * resource.
- *
- * @param {object} [parameters.tags] Gets or sets the tags attached to the
- * resource.
- *
  * @param {object} [options] Optional Parameters.
  *
  * @param {object} [options.customHeaders] Headers that will be added to the
@@ -472,14 +464,6 @@ class AgentRegistrationInformation {
    * @param {string} parameters.keyName Gets or sets the agent registration key
    * name - primary or secondary. Possible values include: 'primary', 'secondary'
    *
-   * @param {string} [parameters.name] Gets or sets the name of the resource.
-   *
-   * @param {string} [parameters.location] Gets or sets the location of the
-   * resource.
-   *
-   * @param {object} [parameters.tags] Gets or sets the tags attached to the
-   * resource.
-   *
    * @param {object} [options] Optional Parameters.
    *
    * @param {object} [options.customHeaders] Headers that will be added to the
@@ -518,14 +502,6 @@ class AgentRegistrationInformation {
    * @param {string} parameters.keyName Gets or sets the agent registration key
    * name - primary or secondary. Possible values include: 'primary', 'secondary'
    *
-   * @param {string} [parameters.name] Gets or sets the name of the resource.
-   *
-   * @param {string} [parameters.location] Gets or sets the location of the
-   * resource.
-   *
-   * @param {object} [parameters.tags] Gets or sets the tags attached to the
-   * resource.
-   *
    * @param {object} [options] Optional Parameters.
    *
    * @param {object} [options.customHeaders] Headers that will be added to the
diff --git a/lib/services/automationManagement/lib/operations/automationAccountOperations.js b/lib/services/automationManagement/lib/operations/automationAccountOperations.js
index a35d725c5a..2cefe84c58 100644
--- a/lib/services/automationManagement/lib/operations/automationAccountOperations.js
+++ b/lib/services/automationManagement/lib/operations/automationAccountOperations.js
@@ -17,9 +17,9 @@ const WebResource = msRest.WebResource;
 /**
  * Update an automation account.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName Automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} parameters Parameters supplied to the update automation
  * account.
@@ -76,6 +76,14 @@ function _update(resourceGroupName, automationAccountName, parameters, options,
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -204,10 +212,9 @@ function _update(resourceGroupName, automationAccountName, parameters, options,
 /**
  * Create or update automation account.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName Parameters supplied to the create or
- * update automation account.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} parameters Parameters supplied to the create or update
  * automation account.
@@ -264,6 +271,14 @@ function _createOrUpdate(resourceGroupName, automationAccountName, parameters, o
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -409,9 +424,9 @@ function _createOrUpdate(resourceGroupName, automationAccountName, parameters, o
 /**
  * Delete an automation account.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName Automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -447,6 +462,14 @@ function _deleteMethod(resourceGroupName, automationAccountName, options, callba
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -541,9 +564,9 @@ function _deleteMethod(resourceGroupName, automationAccountName, options, callba
 /**
  * Get information about an Automation Account.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -580,6 +603,14 @@ function _get(resourceGroupName, automationAccountName, options, callback) {
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -691,7 +722,7 @@ function _get(resourceGroupName, automationAccountName, options, callback) {
 /**
  * Retrieve a list of accounts within a given resource group.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -729,6 +760,14 @@ function _listByResourceGroup(resourceGroupName, options, callback) {
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -1249,9 +1288,9 @@ class AutomationAccountOperations {
   /**
    * Update an automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} parameters Parameters supplied to the update automation
    * account.
@@ -1301,9 +1340,9 @@ class AutomationAccountOperations {
   /**
    * Update an automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} parameters Parameters supplied to the update automation
    * account.
@@ -1375,10 +1414,9 @@ class AutomationAccountOperations {
   /**
    * Create or update automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Parameters supplied to the create or
-   * update automation account.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} parameters Parameters supplied to the create or update
    * automation account.
@@ -1428,10 +1466,9 @@ class AutomationAccountOperations {
   /**
    * Create or update automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Parameters supplied to the create or
-   * update automation account.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} parameters Parameters supplied to the create or update
    * automation account.
@@ -1503,9 +1540,9 @@ class AutomationAccountOperations {
   /**
    * Delete an automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1535,9 +1572,9 @@ class AutomationAccountOperations {
   /**
    * Delete an automation account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1588,9 +1625,9 @@ class AutomationAccountOperations {
   /**
    * Get information about an Automation Account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1620,9 +1657,9 @@ class AutomationAccountOperations {
   /**
    * Get information about an Automation Account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1674,7 +1711,7 @@ class AutomationAccountOperations {
   /**
    * Retrieve a list of accounts within a given resource group.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1704,7 +1741,7 @@ class AutomationAccountOperations {
   /**
    * Retrieve a list of accounts within a given resource group.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/certificateOperations.js b/lib/services/automationManagement/lib/operations/certificateOperations.js
index af935dabdb..2a462158e5 100644
--- a/lib/services/automationManagement/lib/operations/certificateOperations.js
+++ b/lib/services/automationManagement/lib/operations/certificateOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} certificateName The name of certificate.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, certificateName
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} certificateName The name of certificate.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, certificateName, options
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} certificateName The parameters supplied to the create or
  * update certificate operation.
@@ -545,7 +545,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, certificateNa
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} certificateName The parameters supplied to the update
  * certificate operation.
@@ -735,7 +735,7 @@ function _update(resourceGroupName, automationAccountName, certificateName, para
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1037,7 +1037,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The name of certificate.
    *
@@ -1071,7 +1071,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The name of certificate.
    *
@@ -1126,7 +1126,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The name of certificate.
    *
@@ -1160,7 +1160,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The name of certificate.
    *
@@ -1216,7 +1216,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The parameters supplied to the create or
    * update certificate operation.
@@ -1268,7 +1268,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The parameters supplied to the create or
    * update certificate operation.
@@ -1342,7 +1342,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The parameters supplied to the update
    * certificate operation.
@@ -1385,7 +1385,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} certificateName The parameters supplied to the update
    * certificate operation.
@@ -1450,7 +1450,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1482,7 +1482,7 @@ class CertificateOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/connectionOperations.js b/lib/services/automationManagement/lib/operations/connectionOperations.js
index b6cdfdb030..43d5aa3082 100644
--- a/lib/services/automationManagement/lib/operations/connectionOperations.js
+++ b/lib/services/automationManagement/lib/operations/connectionOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionName The name of connection.
  *
@@ -183,7 +183,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, connectionName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionName The name of connection.
  *
@@ -347,7 +347,7 @@ function _get(resourceGroupName, automationAccountName, connectionName, options,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionName The parameters supplied to the create or
  * update connection operation.
@@ -563,7 +563,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, connectionNam
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionName The parameters supplied to the update a
  * connection operation.
@@ -756,7 +756,7 @@ function _update(resourceGroupName, automationAccountName, connectionName, param
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1058,7 +1058,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The name of connection.
    *
@@ -1092,7 +1092,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The name of connection.
    *
@@ -1148,7 +1148,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The name of connection.
    *
@@ -1182,7 +1182,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The name of connection.
    *
@@ -1238,7 +1238,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The parameters supplied to the create or
    * update connection operation.
@@ -1290,7 +1290,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The parameters supplied to the create or
    * update connection operation.
@@ -1364,7 +1364,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The parameters supplied to the update a
    * connection operation.
@@ -1410,7 +1410,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionName The parameters supplied to the update a
    * connection operation.
@@ -1478,7 +1478,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1510,7 +1510,7 @@ class ConnectionOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/connectionTypeOperations.js b/lib/services/automationManagement/lib/operations/connectionTypeOperations.js
index fdd1e9fedb..33fa0617b0 100644
--- a/lib/services/automationManagement/lib/operations/connectionTypeOperations.js
+++ b/lib/services/automationManagement/lib/operations/connectionTypeOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionTypeName The name of connectiontype.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, connectionTypeN
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionTypeName The name of connectiontype.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, connectionTypeName, opti
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} connectionTypeName The parameters supplied to the create or
  * update connectiontype operation.
@@ -540,7 +540,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, connectionTyp
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -843,7 +843,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The name of connectiontype.
    *
@@ -877,7 +877,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The name of connectiontype.
    *
@@ -932,7 +932,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The name of connectiontype.
    *
@@ -966,7 +966,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The name of connectiontype.
    *
@@ -1022,7 +1022,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The parameters supplied to the create or
    * update connectiontype operation.
@@ -1069,7 +1069,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} connectionTypeName The parameters supplied to the create or
    * update connectiontype operation.
@@ -1138,7 +1138,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1170,7 +1170,7 @@ class ConnectionTypeOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/credentialOperations.js b/lib/services/automationManagement/lib/operations/credentialOperations.js
index f617c56f0b..e54ce28c47 100644
--- a/lib/services/automationManagement/lib/operations/credentialOperations.js
+++ b/lib/services/automationManagement/lib/operations/credentialOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} credentialName The name of credential.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, credentialName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} credentialName The name of credential.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, credentialName, options,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} credentialName The parameters supplied to the create or
  * update credential operation.
@@ -542,7 +542,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, credentialNam
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} credentialName The parameters supplied to the Update
  * credential operation.
@@ -738,7 +738,7 @@ function _update(resourceGroupName, automationAccountName, credentialName, param
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1038,7 +1038,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The name of credential.
    *
@@ -1072,7 +1072,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The name of credential.
    *
@@ -1127,7 +1127,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The name of credential.
    *
@@ -1161,7 +1161,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The name of credential.
    *
@@ -1217,7 +1217,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The parameters supplied to the create or
    * update credential operation.
@@ -1266,7 +1266,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The parameters supplied to the create or
    * update credential operation.
@@ -1337,7 +1337,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The parameters supplied to the Update
    * credential operation.
@@ -1386,7 +1386,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} credentialName The parameters supplied to the Update
    * credential operation.
@@ -1457,7 +1457,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1489,7 +1489,7 @@ class CredentialOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/dscCompilationJobOperations.js b/lib/services/automationManagement/lib/operations/dscCompilationJobOperations.js
index d89ef1d387..37c4d3773f 100644
--- a/lib/services/automationManagement/lib/operations/dscCompilationJobOperations.js
+++ b/lib/services/automationManagement/lib/operations/dscCompilationJobOperations.js
@@ -35,8 +35,8 @@ const WebResource = msRest.WebResource;
  * @param {object} [parameters.parameters] Gets or sets the parameters of the
  * job.
  *
- * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
- * new build version of NodeConfiguration is required.
+ * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+ * version of NodeConfiguration is required.
  *
  * @param {string} [parameters.name] Gets or sets name of the resource.
  *
@@ -638,8 +638,8 @@ function _getStream(resourceGroupName, automationAccountName, jobId, jobStreamId
  * @param {object} [parameters.parameters] Gets or sets the parameters of the
  * job.
  *
- * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
- * new build version of NodeConfiguration is required.
+ * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+ * version of NodeConfiguration is required.
  *
  * @param {string} [parameters.name] Gets or sets name of the resource.
  *
@@ -986,8 +986,8 @@ class DscCompilationJobOperations {
    * @param {object} [parameters.parameters] Gets or sets the parameters of the
    * job.
    *
-   * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-   * new build version of NodeConfiguration is required.
+   * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+   * version of NodeConfiguration is required.
    *
    * @param {string} [parameters.name] Gets or sets name of the resource.
    *
@@ -1042,8 +1042,8 @@ class DscCompilationJobOperations {
    * @param {object} [parameters.parameters] Gets or sets the parameters of the
    * job.
    *
-   * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-   * new build version of NodeConfiguration is required.
+   * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+   * version of NodeConfiguration is required.
    *
    * @param {string} [parameters.name] Gets or sets name of the resource.
    *
@@ -1395,8 +1395,8 @@ class DscCompilationJobOperations {
    * @param {object} [parameters.parameters] Gets or sets the parameters of the
    * job.
    *
-   * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-   * new build version of NodeConfiguration is required.
+   * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+   * version of NodeConfiguration is required.
    *
    * @param {string} [parameters.name] Gets or sets name of the resource.
    *
@@ -1451,8 +1451,8 @@ class DscCompilationJobOperations {
    * @param {object} [parameters.parameters] Gets or sets the parameters of the
    * job.
    *
-   * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-   * new build version of NodeConfiguration is required.
+   * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+   * version of NodeConfiguration is required.
    *
    * @param {string} [parameters.name] Gets or sets name of the resource.
    *
diff --git a/lib/services/automationManagement/lib/operations/dscConfigurationOperations.js b/lib/services/automationManagement/lib/operations/dscConfigurationOperations.js
index 9e0561afa8..44d5ac3d7b 100644
--- a/lib/services/automationManagement/lib/operations/dscConfigurationOperations.js
+++ b/lib/services/automationManagement/lib/operations/dscConfigurationOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} configurationName The configuration name.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, configurationNa
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} configurationName The configuration name.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, configurationName, optio
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} configurationName The create or update parameters for
  * configuration.
@@ -568,7 +568,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, configuration
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} configurationName The create or update parameters for
  * configuration.
@@ -787,7 +787,7 @@ function _update(resourceGroupName, automationAccountName, configurationName, op
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} configurationName The configuration name.
  *
@@ -956,7 +956,7 @@ function _getContent(resourceGroupName, automationAccountName, configurationName
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1297,7 +1297,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1331,7 +1331,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1386,7 +1386,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1420,7 +1420,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1476,7 +1476,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The create or update parameters for
    * configuration.
@@ -1551,7 +1551,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The create or update parameters for
    * configuration.
@@ -1648,7 +1648,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The create or update parameters for
    * configuration.
@@ -1722,7 +1722,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The create or update parameters for
    * configuration.
@@ -1818,7 +1818,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1852,7 +1852,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} configurationName The configuration name.
    *
@@ -1907,7 +1907,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1947,7 +1947,7 @@ class DscConfigurationOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/dscNodeOperations.js b/lib/services/automationManagement/lib/operations/dscNodeOperations.js
index 3b28a08e33..ed3b22b190 100644
--- a/lib/services/automationManagement/lib/operations/dscNodeOperations.js
+++ b/lib/services/automationManagement/lib/operations/dscNodeOperations.js
@@ -357,12 +357,6 @@ function _get(resourceGroupName, automationAccountName, nodeId, options, callbac
  * @param {string} [dscNodeUpdateParameters.nodeId] Gets or sets the id of the
  * dsc node.
  *
- * @param {object} [dscNodeUpdateParameters.nodeConfiguration] Gets or sets the
- * configuration of the node.
- *
- * @param {string} [dscNodeUpdateParameters.nodeConfiguration.name] Gets or
- * sets the name of the dsc nodeconfiguration.
- *
  * @param {object} [dscNodeUpdateParameters.properties]
  *
  * @param {string} [dscNodeUpdateParameters.properties.name] Gets or sets the
@@ -1072,12 +1066,6 @@ class DscNodeOperations {
    * @param {string} [dscNodeUpdateParameters.nodeId] Gets or sets the id of the
    * dsc node.
    *
-   * @param {object} [dscNodeUpdateParameters.nodeConfiguration] Gets or sets the
-   * configuration of the node.
-   *
-   * @param {string} [dscNodeUpdateParameters.nodeConfiguration.name] Gets or
-   * sets the name of the dsc nodeconfiguration.
-   *
    * @param {object} [dscNodeUpdateParameters.properties]
    *
    * @param {string} [dscNodeUpdateParameters.properties.name] Gets or sets the
@@ -1123,12 +1111,6 @@ class DscNodeOperations {
    * @param {string} [dscNodeUpdateParameters.nodeId] Gets or sets the id of the
    * dsc node.
    *
-   * @param {object} [dscNodeUpdateParameters.nodeConfiguration] Gets or sets the
-   * configuration of the node.
-   *
-   * @param {string} [dscNodeUpdateParameters.nodeConfiguration.name] Gets or
-   * sets the name of the dsc nodeconfiguration.
-   *
    * @param {object} [dscNodeUpdateParameters.properties]
    *
    * @param {string} [dscNodeUpdateParameters.properties.name] Gets or sets the
diff --git a/lib/services/automationManagement/lib/operations/fields.js b/lib/services/automationManagement/lib/operations/fields.js
index 99959d3d38..e42b0b4469 100644
--- a/lib/services/automationManagement/lib/operations/fields.js
+++ b/lib/services/automationManagement/lib/operations/fields.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -200,7 +200,7 @@ class Fields {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -236,7 +236,7 @@ class Fields {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
diff --git a/lib/services/automationManagement/lib/operations/hybridRunbookWorkerGroupOperations.js b/lib/services/automationManagement/lib/operations/hybridRunbookWorkerGroupOperations.js
index 8248bc39ed..23682f4273 100644
--- a/lib/services/automationManagement/lib/operations/hybridRunbookWorkerGroupOperations.js
+++ b/lib/services/automationManagement/lib/operations/hybridRunbookWorkerGroupOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName Automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
  * name
@@ -166,7 +166,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, hybridRunbookWo
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
  * name
@@ -332,7 +332,7 @@ function _get(resourceGroupName, automationAccountName, hybridRunbookWorkerGroup
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
  * name
@@ -523,7 +523,7 @@ function _update(resourceGroupName, automationAccountName, hybridRunbookWorkerGr
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -835,7 +835,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -870,7 +870,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName Automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -926,7 +926,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -961,7 +961,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -1019,7 +1019,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -1062,7 +1062,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
    * name
@@ -1128,7 +1128,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1162,7 +1162,7 @@ class HybridRunbookWorkerGroupOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/index.d.ts b/lib/services/automationManagement/lib/operations/index.d.ts
index fc49ae01f1..fb2ceeb3b3 100644
--- a/lib/services/automationManagement/lib/operations/index.d.ts
+++ b/lib/services/automationManagement/lib/operations/index.d.ts
@@ -24,9 +24,9 @@ export interface AutomationAccountOperations {
     /**
      * Update an automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} parameters Parameters supplied to the update automation
      * account.
@@ -64,9 +64,9 @@ export interface AutomationAccountOperations {
     /**
      * Update an automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} parameters Parameters supplied to the update automation
      * account.
@@ -123,10 +123,9 @@ export interface AutomationAccountOperations {
     /**
      * Create or update automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Parameters supplied to the create or
-     * update automation account.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} parameters Parameters supplied to the create or update
      * automation account.
@@ -164,10 +163,9 @@ export interface AutomationAccountOperations {
     /**
      * Create or update automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Parameters supplied to the create or
-     * update automation account.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} parameters Parameters supplied to the create or update
      * automation account.
@@ -224,9 +222,9 @@ export interface AutomationAccountOperations {
     /**
      * Delete an automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -244,9 +242,9 @@ export interface AutomationAccountOperations {
     /**
      * Delete an automation account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -282,9 +280,9 @@ export interface AutomationAccountOperations {
     /**
      * Get information about an Automation Account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -302,9 +300,9 @@ export interface AutomationAccountOperations {
     /**
      * Get information about an Automation Account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -341,7 +339,7 @@ export interface AutomationAccountOperations {
     /**
      * Retrieve a list of accounts within a given resource group.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -359,7 +357,7 @@ export interface AutomationAccountOperations {
     /**
      * Retrieve a list of accounts within a given resource group.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -642,9 +640,9 @@ export interface StatisticsOperations {
     /**
      * Retrieve the statistics for the account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -664,9 +662,9 @@ export interface StatisticsOperations {
     /**
      * Retrieve the statistics for the account.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -714,9 +712,9 @@ export interface Usages {
     /**
      * Retrieve the usage for the account id.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -734,9 +732,9 @@ export interface Usages {
     /**
      * Retrieve the usage for the account id.
      *
-     * @param {string} resourceGroupName The resource group name.
+     * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -784,7 +782,7 @@ export interface Keys {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -804,7 +802,7 @@ export interface Keys {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -852,7 +850,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The name of certificate.
      *
@@ -874,7 +872,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The name of certificate.
      *
@@ -914,7 +912,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The name of certificate.
      *
@@ -936,7 +934,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The name of certificate.
      *
@@ -977,7 +975,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The parameters supplied to the create or
      * update certificate operation.
@@ -1017,7 +1015,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The parameters supplied to the create or
      * update certificate operation.
@@ -1076,7 +1074,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The parameters supplied to the update
      * certificate operation.
@@ -1107,7 +1105,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} certificateName The parameters supplied to the update
      * certificate operation.
@@ -1157,7 +1155,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -1177,7 +1175,7 @@ export interface CertificateOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -1282,7 +1280,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The name of connection.
      *
@@ -1304,7 +1302,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The name of connection.
      *
@@ -1345,7 +1343,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The name of connection.
      *
@@ -1367,7 +1365,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The name of connection.
      *
@@ -1408,7 +1406,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The parameters supplied to the create or
      * update connection operation.
@@ -1448,7 +1446,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The parameters supplied to the create or
      * update connection operation.
@@ -1507,7 +1505,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The parameters supplied to the update a
      * connection operation.
@@ -1541,7 +1539,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionName The parameters supplied to the update a
      * connection operation.
@@ -1594,7 +1592,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -1614,7 +1612,7 @@ export interface ConnectionOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -1719,7 +1717,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The name of connectiontype.
      *
@@ -1741,7 +1739,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The name of connectiontype.
      *
@@ -1781,7 +1779,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The name of connectiontype.
      *
@@ -1803,7 +1801,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The name of connectiontype.
      *
@@ -1844,7 +1842,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The parameters supplied to the create or
      * update connectiontype operation.
@@ -1879,7 +1877,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} connectionTypeName The parameters supplied to the create or
      * update connectiontype operation.
@@ -1933,7 +1931,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -1953,7 +1951,7 @@ export interface ConnectionTypeOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -2060,7 +2058,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The name of credential.
      *
@@ -2082,7 +2080,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The name of credential.
      *
@@ -2122,7 +2120,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The name of credential.
      *
@@ -2144,7 +2142,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The name of credential.
      *
@@ -2185,7 +2183,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The parameters supplied to the create or
      * update credential operation.
@@ -2222,7 +2220,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The parameters supplied to the create or
      * update credential operation.
@@ -2278,7 +2276,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The parameters supplied to the Update
      * credential operation.
@@ -2315,7 +2313,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} credentialName The parameters supplied to the Update
      * credential operation.
@@ -2371,7 +2369,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -2391,7 +2389,7 @@ export interface CredentialOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -2496,7 +2494,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2518,7 +2516,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2558,7 +2556,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2580,7 +2578,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2621,7 +2619,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The create or update parameters for
      * configuration.
@@ -2684,7 +2682,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The create or update parameters for
      * configuration.
@@ -2766,7 +2764,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The create or update parameters for
      * configuration.
@@ -2828,7 +2826,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The create or update parameters for
      * configuration.
@@ -2909,7 +2907,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2931,7 +2929,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} configurationName The configuration name.
      *
@@ -2971,7 +2969,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -2999,7 +2997,7 @@ export interface DscConfigurationOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3114,7 +3112,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3137,7 +3135,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName Automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3178,7 +3176,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3201,7 +3199,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3244,7 +3242,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3275,7 +3273,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} hybridRunbookWorkerGroupName The hybrid runbook worker group
      * name
@@ -3326,7 +3324,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3348,7 +3346,7 @@ export interface HybridRunbookWorkerGroupOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3457,7 +3455,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3479,7 +3477,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3519,7 +3517,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3541,7 +3539,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3582,7 +3580,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3592,7 +3590,7 @@ export interface JobScheduleOperations {
      * @param {object} parameters.schedule Gets or sets the schedule.
      *
      * @param {string} [parameters.schedule.name] Gets or sets the name of the
-     * schedule.
+     * Schedule.
      *
      * @param {object} parameters.runbook Gets or sets the runbook.
      *
@@ -3623,7 +3621,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {uuid} jobScheduleId The job schedule name.
      *
@@ -3633,7 +3631,7 @@ export interface JobScheduleOperations {
      * @param {object} parameters.schedule Gets or sets the schedule.
      *
      * @param {string} [parameters.schedule.name] Gets or sets the name of the
-     * schedule.
+     * Schedule.
      *
      * @param {object} parameters.runbook Gets or sets the runbook.
      *
@@ -3683,7 +3681,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3705,7 +3703,7 @@ export interface JobScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3812,7 +3810,7 @@ export interface LinkedWorkspaceOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3832,7 +3830,7 @@ export interface LinkedWorkspaceOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -3881,7 +3879,7 @@ export interface ActivityOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -3906,7 +3904,7 @@ export interface ActivityOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -3949,7 +3947,7 @@ export interface ActivityOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -3971,7 +3969,7 @@ export interface ActivityOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4078,7 +4076,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The module name.
      *
@@ -4100,7 +4098,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The module name.
      *
@@ -4140,7 +4138,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The module name.
      *
@@ -4162,7 +4160,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The module name.
      *
@@ -4203,7 +4201,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4251,7 +4249,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4318,7 +4316,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4367,7 +4365,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4435,7 +4433,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -4455,7 +4453,7 @@ export interface ModuleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -4560,7 +4558,7 @@ export interface ObjectDataTypes {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4584,7 +4582,7 @@ export interface ObjectDataTypes {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4627,7 +4625,7 @@ export interface ObjectDataTypes {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} typeName The name of type.
      *
@@ -4649,7 +4647,7 @@ export interface ObjectDataTypes {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} typeName The name of type.
      *
@@ -4699,7 +4697,7 @@ export interface Fields {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4723,7 +4721,7 @@ export interface Fields {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} moduleName The name of module.
      *
@@ -4775,7 +4773,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4797,7 +4795,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4837,7 +4835,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4861,7 +4859,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4903,7 +4901,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4925,7 +4923,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -4966,7 +4964,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the publish runbook
      * operation.
@@ -4978,18 +4976,18 @@ export interface RunbookDraftOperations {
      *
      * @returns {Promise} A promise is returned
      *
-     * @resolve {HttpOperationResponse<String>} - The deserialized result object.
+     * @resolve {HttpOperationResponse<null>} - The deserialized result object.
      *
      * @reject {Error|ServiceError} - The error object.
      */
-    publishWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<string>>;
+    publishWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<void>>;
 
     /**
      * Publish runbook draft.
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the publish runbook
      * operation.
@@ -5006,7 +5004,7 @@ export interface RunbookDraftOperations {
      *
      * {Promise} A promise is returned.
      *
-     *                      @resolve {String} - The deserialized result object.
+     *                      @resolve {null} - The deserialized result object.
      *
      *                      @reject {Error|ServiceError} - The error object.
      *
@@ -5014,15 +5012,15 @@ export interface RunbookDraftOperations {
      *
      *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
      *
-     *                      {String} [result]   - The deserialized result object if an error did not occur.
+     *                      {null} [result]   - The deserialized result object if an error did not occur.
      *
      *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
      *
      *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
      */
-    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<string>;
-    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, callback: ServiceCallback<string>): void;
-    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<string>): void;
+    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<void>;
+    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, callback: ServiceCallback<void>): void;
+    publish(resourceGroupName: string, automationAccountName: string, runbookName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
 
 
     /**
@@ -5030,7 +5028,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5052,7 +5050,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5094,7 +5092,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5118,7 +5116,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5160,7 +5158,7 @@ export interface RunbookDraftOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the publish runbook
      * operation.
@@ -5172,18 +5170,18 @@ export interface RunbookDraftOperations {
      *
      * @returns {Promise} A promise is returned
      *
-     * @resolve {HttpOperationResponse<String>} - The deserialized result object.
+     * @resolve {HttpOperationResponse<null>} - The deserialized result object.
      *
      * @reject {Error|ServiceError} - The error object.
      */
-    beginPublishWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<string>>;
+    beginPublishWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<void>>;
 
     /**
      * Publish runbook draft.
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the publish runbook
      * operation.
@@ -5200,7 +5198,7 @@ export interface RunbookDraftOperations {
      *
      * {Promise} A promise is returned.
      *
-     *                      @resolve {String} - The deserialized result object.
+     *                      @resolve {null} - The deserialized result object.
      *
      *                      @reject {Error|ServiceError} - The error object.
      *
@@ -5208,15 +5206,15 @@ export interface RunbookDraftOperations {
      *
      *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
      *
-     *                      {String} [result]   - The deserialized result object if an error did not occur.
+     *                      {null} [result]   - The deserialized result object if an error did not occur.
      *
      *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
      *
      *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
      */
-    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<string>;
-    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, callback: ServiceCallback<string>): void;
-    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<string>): void;
+    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<void>;
+    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, callback: ServiceCallback<void>): void;
+    beginPublish(resourceGroupName: string, automationAccountName: string, runbookName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
 }
 
 /**
@@ -5233,7 +5231,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5255,7 +5253,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5295,7 +5293,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5317,7 +5315,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5358,7 +5356,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5444,7 +5442,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5549,7 +5547,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5591,7 +5589,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5652,7 +5650,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5674,7 +5672,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5714,7 +5712,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -5734,7 +5732,7 @@ export interface RunbookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -5840,7 +5838,7 @@ export interface TestJobStreams {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5865,7 +5863,7 @@ export interface TestJobStreams {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5908,7 +5906,7 @@ export interface TestJobStreams {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -5932,7 +5930,7 @@ export interface TestJobStreams {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6041,7 +6039,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the create test job
      * operation.
@@ -6073,7 +6071,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The parameters supplied to the create test job
      * operation.
@@ -6124,7 +6122,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6146,7 +6144,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6187,7 +6185,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6209,7 +6207,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6249,7 +6247,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6271,7 +6269,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6311,7 +6309,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6333,7 +6331,7 @@ export interface TestJobOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} runbookName The runbook name.
      *
@@ -6382,14 +6380,14 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
      * @param {object} parameters The parameters supplied to the create or update
      * schedule operation.
      *
-     * @param {string} parameters.name Gets or sets the name of the schedule.
+     * @param {string} parameters.name Gets or sets the name of the Schedule.
      *
      * @param {string} [parameters.description] Gets or sets the description of the
      * schedule.
@@ -6439,14 +6437,14 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
      * @param {object} parameters The parameters supplied to the create or update
      * schedule operation.
      *
-     * @param {string} parameters.name Gets or sets the name of the schedule.
+     * @param {string} parameters.name Gets or sets the name of the Schedule.
      *
      * @param {string} [parameters.description] Gets or sets the description of the
      * schedule.
@@ -6515,14 +6513,14 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
      * @param {object} parameters The parameters supplied to the update schedule
      * operation.
      *
-     * @param {string} [parameters.name] Gets or sets the name of the schedule.
+     * @param {string} [parameters.name] Gets or sets the name of the Schedule.
      *
      * @param {string} [parameters.description] Gets or sets the description of the
      * schedule.
@@ -6548,14 +6546,14 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
      * @param {object} parameters The parameters supplied to the update schedule
      * operation.
      *
-     * @param {string} [parameters.name] Gets or sets the name of the schedule.
+     * @param {string} [parameters.name] Gets or sets the name of the Schedule.
      *
      * @param {string} [parameters.description] Gets or sets the description of the
      * schedule.
@@ -6600,7 +6598,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
@@ -6622,7 +6620,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
@@ -6663,7 +6661,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
@@ -6685,7 +6683,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} scheduleName The schedule name.
      *
@@ -6725,7 +6723,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -6745,7 +6743,7 @@ export interface ScheduleOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -6850,7 +6848,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The variable name.
      *
@@ -6885,7 +6883,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The variable name.
      *
@@ -6939,7 +6937,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The variable name.
      *
@@ -6971,7 +6969,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The variable name.
      *
@@ -7022,7 +7020,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The name of variable.
      *
@@ -7044,7 +7042,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The name of variable.
      *
@@ -7084,7 +7082,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The name of variable.
      *
@@ -7106,7 +7104,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} variableName The name of variable.
      *
@@ -7147,7 +7145,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -7167,7 +7165,7 @@ export interface VariableOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -7272,7 +7270,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -7292,7 +7290,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -7330,7 +7328,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7352,7 +7350,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7392,7 +7390,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7414,7 +7412,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7455,7 +7453,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7499,7 +7497,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7562,7 +7560,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7600,7 +7598,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {string} webhookName The webhook name.
      *
@@ -7657,7 +7655,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -7679,7 +7677,7 @@ export interface WebhookOperations {
      *
      * @param {string} resourceGroupName Name of an Azure Resource group.
      *
-     * @param {string} automationAccountName The automation account name.
+     * @param {string} automationAccountName The name of the automation account.
      *
      * @param {object} [options] Optional Parameters.
      *
@@ -10553,14 +10551,6 @@ export interface AgentRegistrationInformation {
      * @param {string} parameters.keyName Gets or sets the agent registration key
      * name - primary or secondary. Possible values include: 'primary', 'secondary'
      *
-     * @param {string} [parameters.name] Gets or sets the name of the resource.
-     *
-     * @param {string} [parameters.location] Gets or sets the location of the
-     * resource.
-     *
-     * @param {object} [parameters.tags] Gets or sets the tags attached to the
-     * resource.
-     *
      * @param {object} [options] Optional Parameters.
      *
      * @param {object} [options.customHeaders] Headers that will be added to the
@@ -10587,14 +10577,6 @@ export interface AgentRegistrationInformation {
      * @param {string} parameters.keyName Gets or sets the agent registration key
      * name - primary or secondary. Possible values include: 'primary', 'secondary'
      *
-     * @param {string} [parameters.name] Gets or sets the name of the resource.
-     *
-     * @param {string} [parameters.location] Gets or sets the location of the
-     * resource.
-     *
-     * @param {object} [parameters.tags] Gets or sets the tags attached to the
-     * resource.
-     *
      * @param {object} [options] Optional Parameters.
      *
      * @param {object} [options.customHeaders] Headers that will be added to the
@@ -10777,12 +10759,6 @@ export interface DscNodeOperations {
      * @param {string} [dscNodeUpdateParameters.nodeId] Gets or sets the id of the
      * dsc node.
      *
-     * @param {object} [dscNodeUpdateParameters.nodeConfiguration] Gets or sets the
-     * configuration of the node.
-     *
-     * @param {string} [dscNodeUpdateParameters.nodeConfiguration.name] Gets or
-     * sets the name of the dsc nodeconfiguration.
-     *
      * @param {object} [dscNodeUpdateParameters.properties]
      *
      * @param {string} [dscNodeUpdateParameters.properties.name] Gets or sets the
@@ -10816,12 +10792,6 @@ export interface DscNodeOperations {
      * @param {string} [dscNodeUpdateParameters.nodeId] Gets or sets the id of the
      * dsc node.
      *
-     * @param {object} [dscNodeUpdateParameters.nodeConfiguration] Gets or sets the
-     * configuration of the node.
-     *
-     * @param {string} [dscNodeUpdateParameters.nodeConfiguration.name] Gets or
-     * sets the name of the dsc nodeconfiguration.
-     *
      * @param {object} [dscNodeUpdateParameters.properties]
      *
      * @param {string} [dscNodeUpdateParameters.properties.name] Gets or sets the
@@ -11288,8 +11258,8 @@ export interface DscCompilationJobOperations {
      * @param {object} [parameters.parameters] Gets or sets the parameters of the
      * job.
      *
-     * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-     * new build version of NodeConfiguration is required.
+     * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+     * version of NodeConfiguration is required.
      *
      * @param {string} [parameters.name] Gets or sets name of the resource.
      *
@@ -11332,8 +11302,8 @@ export interface DscCompilationJobOperations {
      * @param {object} [parameters.parameters] Gets or sets the parameters of the
      * job.
      *
-     * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-     * new build version of NodeConfiguration is required.
+     * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+     * version of NodeConfiguration is required.
      *
      * @param {string} [parameters.name] Gets or sets name of the resource.
      *
@@ -11589,8 +11559,8 @@ export interface DscCompilationJobOperations {
      * @param {object} [parameters.parameters] Gets or sets the parameters of the
      * job.
      *
-     * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-     * new build version of NodeConfiguration is required.
+     * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+     * version of NodeConfiguration is required.
      *
      * @param {string} [parameters.name] Gets or sets name of the resource.
      *
@@ -11633,8 +11603,8 @@ export interface DscCompilationJobOperations {
      * @param {object} [parameters.parameters] Gets or sets the parameters of the
      * job.
      *
-     * @param {boolean} [parameters.newNodeConfigurationBuildVersionRequired] If a
-     * new build version of NodeConfiguration is required.
+     * @param {boolean} [parameters.incrementNodeConfigurationBuild] If a new build
+     * version of NodeConfiguration is required.
      *
      * @param {string} [parameters.name] Gets or sets name of the resource.
      *
@@ -12343,3 +12313,567 @@ export interface DscNodeConfigurationOperations {
     listByAutomationAccountNext(nextPageLink: string, callback: ServiceCallback<models.DscNodeConfigurationListResult>): void;
     listByAutomationAccountNext(nextPageLink: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.DscNodeConfigurationListResult>): void;
 }
+
+/**
+ * @class
+ * WatcherOperations
+ * __NOTE__: An instance of this class is automatically created for an
+ * instance of the AutomationClient.
+ */
+export interface WatcherOperations {
+
+
+    /**
+     * Create the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} parameters The create or update parameters for watcher.
+     *
+     * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+     * frequency at which the watcher is invoked.
+     *
+     * @param {string} [parameters.scriptName] Gets or sets the name of the script
+     * the watcher is attached to, i.e. the name of an existing runbook.
+     *
+     * @param {object} [parameters.scriptParameters] Gets or sets the parameters of
+     * the script.
+     *
+     * @param {string} [parameters.scriptRunOn] Gets or sets the name of the hybrid
+     * worker group the watcher will run on.
+     *
+     * @param {string} [parameters.description] Gets or sets the description.
+     *
+     * @param {string} [parameters.etag] Gets or sets the etag of the resource.
+     *
+     * @param {object} [parameters.tags] Resource tags.
+     *
+     * @param {string} [parameters.location] The Azure Region where the resource
+     * lives
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    createOrUpdateWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.Watcher, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.Watcher>>;
+
+    /**
+     * Create the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} parameters The create or update parameters for watcher.
+     *
+     * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+     * frequency at which the watcher is invoked.
+     *
+     * @param {string} [parameters.scriptName] Gets or sets the name of the script
+     * the watcher is attached to, i.e. the name of an existing runbook.
+     *
+     * @param {object} [parameters.scriptParameters] Gets or sets the parameters of
+     * the script.
+     *
+     * @param {string} [parameters.scriptRunOn] Gets or sets the name of the hybrid
+     * worker group the watcher will run on.
+     *
+     * @param {string} [parameters.description] Gets or sets the description.
+     *
+     * @param {string} [parameters.etag] Gets or sets the etag of the resource.
+     *
+     * @param {object} [parameters.tags] Resource tags.
+     *
+     * @param {string} [parameters.location] The Azure Region where the resource
+     * lives
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {Watcher} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {Watcher} [result]   - The deserialized result object if an error did not occur.
+     *                      See {@link Watcher} for more information.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    createOrUpdate(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.Watcher, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<models.Watcher>;
+    createOrUpdate(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.Watcher, callback: ServiceCallback<models.Watcher>): void;
+    createOrUpdate(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.Watcher, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Watcher>): void;
+
+
+    /**
+     * Retrieve the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    getWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.Watcher>>;
+
+    /**
+     * Retrieve the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {Watcher} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {Watcher} [result]   - The deserialized result object if an error did not occur.
+     *                      See {@link Watcher} for more information.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    get(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<models.Watcher>;
+    get(resourceGroupName: string, automationAccountName: string, watcherName: string, callback: ServiceCallback<models.Watcher>): void;
+    get(resourceGroupName: string, automationAccountName: string, watcherName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Watcher>): void;
+
+
+    /**
+     * Update the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} parameters The update parameters for watcher.
+     *
+     * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+     * frequency at which the watcher is invoked.
+     *
+     * @param {string} [parameters.name] Gets or sets the name of the resource.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    updateWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.WatcherUpdateParameters, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.Watcher>>;
+
+    /**
+     * Update the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} parameters The update parameters for watcher.
+     *
+     * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+     * frequency at which the watcher is invoked.
+     *
+     * @param {string} [parameters.name] Gets or sets the name of the resource.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {Watcher} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {Watcher} [result]   - The deserialized result object if an error did not occur.
+     *                      See {@link Watcher} for more information.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    update(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.WatcherUpdateParameters, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<models.Watcher>;
+    update(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.WatcherUpdateParameters, callback: ServiceCallback<models.Watcher>): void;
+    update(resourceGroupName: string, automationAccountName: string, watcherName: string, parameters: models.WatcherUpdateParameters, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Watcher>): void;
+
+
+    /**
+     * Delete the watcher by name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    deleteMethodWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<void>>;
+
+    /**
+     * Delete the watcher by name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {null} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {null} [result]   - The deserialized result object if an error did not occur.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    deleteMethod(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<void>;
+    deleteMethod(resourceGroupName: string, automationAccountName: string, watcherName: string, callback: ServiceCallback<void>): void;
+    deleteMethod(resourceGroupName: string, automationAccountName: string, watcherName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+
+
+    /**
+     * Resume the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    startWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<void>>;
+
+    /**
+     * Resume the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {null} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {null} [result]   - The deserialized result object if an error did not occur.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    start(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<void>;
+    start(resourceGroupName: string, automationAccountName: string, watcherName: string, callback: ServiceCallback<void>): void;
+    start(resourceGroupName: string, automationAccountName: string, watcherName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+
+
+    /**
+     * Resume the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    stopWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<void>>;
+
+    /**
+     * Resume the watcher identified by watcher name.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {string} watcherName The watcher name.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {null} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {null} [result]   - The deserialized result object if an error did not occur.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    stop(resourceGroupName: string, automationAccountName: string, watcherName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<void>;
+    stop(resourceGroupName: string, automationAccountName: string, watcherName: string, callback: ServiceCallback<void>): void;
+    stop(resourceGroupName: string, automationAccountName: string, watcherName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+
+
+    /**
+     * Retrieve a list of watchers.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {string} [options.filter] The filter to apply on the operation.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<WatcherListResult>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    listByAutomationAccountWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, options?: { filter? : string, customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.WatcherListResult>>;
+
+    /**
+     * Retrieve a list of watchers.
+     *
+     * @param {string} resourceGroupName Name of an Azure Resource group.
+     *
+     * @param {string} automationAccountName The name of the automation account.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {string} [options.filter] The filter to apply on the operation.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {WatcherListResult} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {WatcherListResult} [result]   - The deserialized result object if an error did not occur.
+     *                      See {@link WatcherListResult} for more information.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    listByAutomationAccount(resourceGroupName: string, automationAccountName: string, options?: { filter? : string, customHeaders? : { [headerName: string]: string; } }): Promise<models.WatcherListResult>;
+    listByAutomationAccount(resourceGroupName: string, automationAccountName: string, callback: ServiceCallback<models.WatcherListResult>): void;
+    listByAutomationAccount(resourceGroupName: string, automationAccountName: string, options: { filter? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.WatcherListResult>): void;
+
+
+    /**
+     * Retrieve a list of watchers.
+     *
+     * @param {string} nextPageLink The NextLink from the previous successful call
+     * to List operation.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @returns {Promise} A promise is returned
+     *
+     * @resolve {HttpOperationResponse<WatcherListResult>} - The deserialized result object.
+     *
+     * @reject {Error|ServiceError} - The error object.
+     */
+    listByAutomationAccountNextWithHttpOperationResponse(nextPageLink: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<models.WatcherListResult>>;
+
+    /**
+     * Retrieve a list of watchers.
+     *
+     * @param {string} nextPageLink The NextLink from the previous successful call
+     * to List operation.
+     *
+     * @param {object} [options] Optional Parameters.
+     *
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     *
+     * @param {ServiceCallback} [optionalCallback] - The optional callback.
+     *
+     * @returns {ServiceCallback|Promise} If a callback was passed as the last
+     * parameter then it returns the callback else returns a Promise.
+     *
+     * {Promise} A promise is returned.
+     *
+     *                      @resolve {WatcherListResult} - The deserialized result object.
+     *
+     *                      @reject {Error|ServiceError} - The error object.
+     *
+     * {ServiceCallback} optionalCallback(err, result, request, response)
+     *
+     *                      {Error|ServiceError}  err        - The Error object if an error occurred, null otherwise.
+     *
+     *                      {WatcherListResult} [result]   - The deserialized result object if an error did not occur.
+     *                      See {@link WatcherListResult} for more information.
+     *
+     *                      {WebResource} [request]  - The HTTP Request object if an error did not occur.
+     *
+     *                      {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
+     */
+    listByAutomationAccountNext(nextPageLink: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<models.WatcherListResult>;
+    listByAutomationAccountNext(nextPageLink: string, callback: ServiceCallback<models.WatcherListResult>): void;
+    listByAutomationAccountNext(nextPageLink: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.WatcherListResult>): void;
+}
diff --git a/lib/services/automationManagement/lib/operations/index.js b/lib/services/automationManagement/lib/operations/index.js
index 5c9e82b603..a26014da0f 100644
--- a/lib/services/automationManagement/lib/operations/index.js
+++ b/lib/services/automationManagement/lib/operations/index.js
@@ -52,3 +52,4 @@ exports.NodeReports = require('./nodeReports');
 exports.DscCompilationJobOperations = require('./dscCompilationJobOperations');
 exports.DscCompilationJobStream = require('./dscCompilationJobStream');
 exports.DscNodeConfigurationOperations = require('./dscNodeConfigurationOperations');
+exports.WatcherOperations = require('./watcherOperations');
diff --git a/lib/services/automationManagement/lib/operations/jobScheduleOperations.js b/lib/services/automationManagement/lib/operations/jobScheduleOperations.js
index 176130ca0c..1dc6f0ee2a 100644
--- a/lib/services/automationManagement/lib/operations/jobScheduleOperations.js
+++ b/lib/services/automationManagement/lib/operations/jobScheduleOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {uuid} jobScheduleId The job schedule name.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, jobScheduleId,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {uuid} jobScheduleId The job schedule name.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, jobScheduleId, options,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {uuid} jobScheduleId The job schedule name.
  *
@@ -339,7 +339,7 @@ function _get(resourceGroupName, automationAccountName, jobScheduleId, options,
  * @param {object} parameters.schedule Gets or sets the schedule.
  *
  * @param {string} [parameters.schedule.name] Gets or sets the name of the
- * schedule.
+ * Schedule.
  *
  * @param {object} parameters.runbook Gets or sets the runbook.
  *
@@ -529,7 +529,7 @@ function _create(resourceGroupName, automationAccountName, jobScheduleId, parame
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -839,7 +839,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -873,7 +873,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -928,7 +928,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -962,7 +962,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -1018,7 +1018,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -1028,7 +1028,7 @@ class JobScheduleOperations {
    * @param {object} parameters.schedule Gets or sets the schedule.
    *
    * @param {string} [parameters.schedule.name] Gets or sets the name of the
-   * schedule.
+   * Schedule.
    *
    * @param {object} parameters.runbook Gets or sets the runbook.
    *
@@ -1071,7 +1071,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {uuid} jobScheduleId The job schedule name.
    *
@@ -1081,7 +1081,7 @@ class JobScheduleOperations {
    * @param {object} parameters.schedule Gets or sets the schedule.
    *
    * @param {string} [parameters.schedule.name] Gets or sets the name of the
-   * schedule.
+   * Schedule.
    *
    * @param {object} parameters.runbook Gets or sets the runbook.
    *
@@ -1146,7 +1146,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1180,7 +1180,7 @@ class JobScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/keys.js b/lib/services/automationManagement/lib/operations/keys.js
index 2df8a00bf8..736f50817a 100644
--- a/lib/services/automationManagement/lib/operations/keys.js
+++ b/lib/services/automationManagement/lib/operations/keys.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -188,7 +188,7 @@ class Keys {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -220,7 +220,7 @@ class Keys {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/linkedWorkspaceOperations.js b/lib/services/automationManagement/lib/operations/linkedWorkspaceOperations.js
index d000df7367..2035ed2505 100644
--- a/lib/services/automationManagement/lib/operations/linkedWorkspaceOperations.js
+++ b/lib/services/automationManagement/lib/operations/linkedWorkspaceOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -188,7 +188,7 @@ class LinkedWorkspaceOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -220,7 +220,7 @@ class LinkedWorkspaceOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/moduleOperations.js b/lib/services/automationManagement/lib/operations/moduleOperations.js
index 132b237c66..1537021a1d 100644
--- a/lib/services/automationManagement/lib/operations/moduleOperations.js
+++ b/lib/services/automationManagement/lib/operations/moduleOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The module name.
  *
@@ -165,7 +165,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, moduleName, opt
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The module name.
  *
@@ -329,7 +329,7 @@ function _get(resourceGroupName, automationAccountName, moduleName, options, cal
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -553,7 +553,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, moduleName, p
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -761,7 +761,7 @@ function _update(resourceGroupName, automationAccountName, moduleName, parameter
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1063,7 +1063,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The module name.
    *
@@ -1097,7 +1097,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The module name.
    *
@@ -1152,7 +1152,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The module name.
    *
@@ -1186,7 +1186,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The module name.
    *
@@ -1242,7 +1242,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -1302,7 +1302,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -1384,7 +1384,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -1445,7 +1445,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -1528,7 +1528,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1560,7 +1560,7 @@ class ModuleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/objectDataTypes.js b/lib/services/automationManagement/lib/operations/objectDataTypes.js
index 602b0aff15..935560eab7 100644
--- a/lib/services/automationManagement/lib/operations/objectDataTypes.js
+++ b/lib/services/automationManagement/lib/operations/objectDataTypes.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} moduleName The name of module.
  *
@@ -189,7 +189,7 @@ function _listFieldsByModuleAndType(resourceGroupName, automationAccountName, mo
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} typeName The name of type.
  *
@@ -365,7 +365,7 @@ class ObjectDataTypes {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -401,7 +401,7 @@ class ObjectDataTypes {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} moduleName The name of module.
    *
@@ -459,7 +459,7 @@ class ObjectDataTypes {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} typeName The name of type.
    *
@@ -493,7 +493,7 @@ class ObjectDataTypes {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} typeName The name of type.
    *
diff --git a/lib/services/automationManagement/lib/operations/runbookDraftOperations.js b/lib/services/automationManagement/lib/operations/runbookDraftOperations.js
index 49787465b5..182c2feead 100644
--- a/lib/services/automationManagement/lib/operations/runbookDraftOperations.js
+++ b/lib/services/automationManagement/lib/operations/runbookDraftOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -188,7 +188,7 @@ function _getContent(resourceGroupName, automationAccountName, runbookName, opti
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -274,7 +274,7 @@ function _replaceContent(resourceGroupName, automationAccountName, runbookName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -439,7 +439,7 @@ function _get(resourceGroupName, automationAccountName, runbookName, options, ca
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The parameters supplied to the publish runbook
  * operation.
@@ -455,7 +455,7 @@ function _get(resourceGroupName, automationAccountName, runbookName, options, ca
  *
  *                      {Error}  err        - The Error object if an error occurred, null otherwise.
  *
- *                      {string} [result]   - The deserialized result object if an error did not occur.
+ *                      {null} [result]   - The deserialized result object if an error did not occur.
  *
  *                      {object} [request]  - The HTTP Request object if an error did not occur.
  *
@@ -493,26 +493,6 @@ function _publish(resourceGroupName, automationAccountName, runbookName, options
       if (responseBody === '') responseBody = null;
 
       // Deserialize Response
-      let parsedResponse = null;
-      try {
-        parsedResponse = JSON.parse(responseBody);
-        result = JSON.parse(responseBody);
-        if (parsedResponse !== null && parsedResponse !== undefined) {
-          let resultMapper = {
-            required: false,
-            serializedName: 'parsedResponse',
-            type: {
-              name: 'String'
-            }
-          };
-          result = client.deserialize(resultMapper, parsedResponse, 'result');
-        }
-      } catch (error) {
-        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
-        deserializationError.request = msRest.stripRequest(httpRequest);
-        deserializationError.response = msRest.stripResponse(response);
-        return callback(deserializationError);
-      }
 
       return callback(null, result, httpRequest, response);
     });
@@ -524,7 +504,7 @@ function _publish(resourceGroupName, automationAccountName, runbookName, options
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -689,7 +669,7 @@ function _undoEdit(resourceGroupName, automationAccountName, runbookName, option
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -883,7 +863,7 @@ function _beginReplaceContent(resourceGroupName, automationAccountName, runbookN
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The parameters supplied to the publish runbook
  * operation.
@@ -899,7 +879,7 @@ function _beginReplaceContent(resourceGroupName, automationAccountName, runbookN
  *
  *                      {Error}  err        - The Error object if an error occurred, null otherwise.
  *
- *                      {string} [result]   - The deserialized result object if an error did not occur.
+ *                      {null} [result]   - The deserialized result object if an error did not occur.
  *
  *                      {object} [request]  - The HTTP Request object if an error did not occur.
  *
@@ -991,7 +971,7 @@ function _beginPublish(resourceGroupName, automationAccountName, runbookName, op
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 202) {
+    if (statusCode !== 202) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -1020,29 +1000,6 @@ function _beginPublish(resourceGroupName, automationAccountName, runbookName, op
     // Create Result
     let result = null;
     if (responseBody === '') responseBody = null;
-    // Deserialize Response
-    if (statusCode === 200) {
-      let parsedResponse = null;
-      try {
-        parsedResponse = JSON.parse(responseBody);
-        result = JSON.parse(responseBody);
-        if (parsedResponse !== null && parsedResponse !== undefined) {
-          let resultMapper = {
-            required: false,
-            serializedName: 'parsedResponse',
-            type: {
-              name: 'String'
-            }
-          };
-          result = client.deserialize(resultMapper, parsedResponse, 'result');
-        }
-      } catch (error) {
-        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
-        deserializationError.request = msRest.stripRequest(httpRequest);
-        deserializationError.response = msRest.stripResponse(response);
-        return callback(deserializationError);
-      }
-    }
 
     return callback(null, result, httpRequest, response);
   });
@@ -1070,7 +1027,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1104,7 +1061,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1159,7 +1116,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1195,7 +1152,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1252,7 +1209,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1286,7 +1243,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1342,7 +1299,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the publish runbook
    * operation.
@@ -1354,7 +1311,7 @@ class RunbookDraftOperations {
    *
    * @returns {Promise} A promise is returned
    *
-   * @resolve {HttpOperationResponse<String>} - The deserialized result object.
+   * @resolve {HttpOperationResponse<null>} - The deserialized result object.
    *
    * @reject {Error} - The error object.
    */
@@ -1377,7 +1334,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the publish runbook
    * operation.
@@ -1394,7 +1351,7 @@ class RunbookDraftOperations {
    *
    * {Promise} A promise is returned
    *
-   *                      @resolve {String} - The deserialized result object.
+   *                      @resolve {null} - The deserialized result object.
    *
    *                      @reject {Error} - The error object.
    *
@@ -1402,7 +1359,7 @@ class RunbookDraftOperations {
    *
    *                      {Error}  err        - The Error object if an error occurred, null otherwise.
    *
-   *                      {string} [result]   - The deserialized result object if an error did not occur.
+   *                      {null} [result]   - The deserialized result object if an error did not occur.
    *
    *                      {object} [request]  - The HTTP Request object if an error did not occur.
    *
@@ -1433,7 +1390,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1467,7 +1424,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1524,7 +1481,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1560,7 +1517,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1617,7 +1574,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the publish runbook
    * operation.
@@ -1629,7 +1586,7 @@ class RunbookDraftOperations {
    *
    * @returns {Promise} A promise is returned
    *
-   * @resolve {HttpOperationResponse<String>} - The deserialized result object.
+   * @resolve {HttpOperationResponse<null>} - The deserialized result object.
    *
    * @reject {Error} - The error object.
    */
@@ -1652,7 +1609,7 @@ class RunbookDraftOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the publish runbook
    * operation.
@@ -1669,7 +1626,7 @@ class RunbookDraftOperations {
    *
    * {Promise} A promise is returned
    *
-   *                      @resolve {String} - The deserialized result object.
+   *                      @resolve {null} - The deserialized result object.
    *
    *                      @reject {Error} - The error object.
    *
@@ -1677,7 +1634,7 @@ class RunbookDraftOperations {
    *
    *                      {Error}  err        - The Error object if an error occurred, null otherwise.
    *
-   *                      {string} [result]   - The deserialized result object if an error did not occur.
+   *                      {null} [result]   - The deserialized result object if an error did not occur.
    *
    *                      {object} [request]  - The HTTP Request object if an error did not occur.
    *
diff --git a/lib/services/automationManagement/lib/operations/runbookOperations.js b/lib/services/automationManagement/lib/operations/runbookOperations.js
index 5880429498..950f0a9d7d 100644
--- a/lib/services/automationManagement/lib/operations/runbookOperations.js
+++ b/lib/services/automationManagement/lib/operations/runbookOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -187,7 +187,7 @@ function _getContent(resourceGroupName, automationAccountName, runbookName, opti
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -351,7 +351,7 @@ function _get(resourceGroupName, automationAccountName, runbookName, options, ca
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -613,7 +613,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, runbookName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -814,7 +814,7 @@ function _update(resourceGroupName, automationAccountName, runbookName, paramete
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -960,7 +960,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, runbookName, op
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1263,7 +1263,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1297,7 +1297,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1352,7 +1352,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1386,7 +1386,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1442,7 +1442,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1540,7 +1540,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1660,7 +1660,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1714,7 +1714,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1790,7 +1790,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1824,7 +1824,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1879,7 +1879,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1911,7 +1911,7 @@ class RunbookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/scheduleOperations.js b/lib/services/automationManagement/lib/operations/scheduleOperations.js
index 2657038aae..1a1af0bfae 100644
--- a/lib/services/automationManagement/lib/operations/scheduleOperations.js
+++ b/lib/services/automationManagement/lib/operations/scheduleOperations.js
@@ -19,14 +19,14 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} scheduleName The schedule name.
  *
  * @param {object} parameters The parameters supplied to the create or update
  * schedule operation.
  *
- * @param {string} parameters.name Gets or sets the name of the schedule.
+ * @param {string} parameters.name Gets or sets the name of the Schedule.
  *
  * @param {string} [parameters.description] Gets or sets the description of the
  * schedule.
@@ -179,7 +179,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, scheduleName,
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 201 && statusCode !== 409) {
+    if (statusCode !== 200 && statusCode !== 409) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -209,7 +209,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, scheduleName,
     let result = null;
     if (responseBody === '') responseBody = null;
     // Deserialize Response
-    if (statusCode === 201) {
+    if (statusCode === 200) {
       let parsedResponse = null;
       try {
         parsedResponse = JSON.parse(responseBody);
@@ -235,14 +235,14 @@ function _createOrUpdate(resourceGroupName, automationAccountName, scheduleName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} scheduleName The schedule name.
  *
  * @param {object} parameters The parameters supplied to the update schedule
  * operation.
  *
- * @param {string} [parameters.name] Gets or sets the name of the schedule.
+ * @param {string} [parameters.name] Gets or sets the name of the Schedule.
  *
  * @param {string} [parameters.description] Gets or sets the description of the
  * schedule.
@@ -427,7 +427,7 @@ function _update(resourceGroupName, automationAccountName, scheduleName, paramet
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} scheduleName The schedule name.
  *
@@ -591,7 +591,7 @@ function _get(resourceGroupName, automationAccountName, scheduleName, options, c
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} scheduleName The schedule name.
  *
@@ -698,7 +698,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, scheduleName, o
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -737,7 +737,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, scheduleName, o
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1039,14 +1039,14 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
    * @param {object} parameters The parameters supplied to the create or update
    * schedule operation.
    *
-   * @param {string} parameters.name Gets or sets the name of the schedule.
+   * @param {string} parameters.name Gets or sets the name of the Schedule.
    *
    * @param {string} [parameters.description] Gets or sets the description of the
    * schedule.
@@ -1108,14 +1108,14 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
    * @param {object} parameters The parameters supplied to the create or update
    * schedule operation.
    *
-   * @param {string} parameters.name Gets or sets the name of the schedule.
+   * @param {string} parameters.name Gets or sets the name of the Schedule.
    *
    * @param {string} [parameters.description] Gets or sets the description of the
    * schedule.
@@ -1199,14 +1199,14 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
    * @param {object} parameters The parameters supplied to the update schedule
    * operation.
    *
-   * @param {string} [parameters.name] Gets or sets the name of the schedule.
+   * @param {string} [parameters.name] Gets or sets the name of the Schedule.
    *
    * @param {string} [parameters.description] Gets or sets the description of the
    * schedule.
@@ -1244,14 +1244,14 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
    * @param {object} parameters The parameters supplied to the update schedule
    * operation.
    *
-   * @param {string} [parameters.name] Gets or sets the name of the schedule.
+   * @param {string} [parameters.name] Gets or sets the name of the Schedule.
    *
    * @param {string} [parameters.description] Gets or sets the description of the
    * schedule.
@@ -1311,7 +1311,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
@@ -1345,7 +1345,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
@@ -1401,7 +1401,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
@@ -1435,7 +1435,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} scheduleName The schedule name.
    *
@@ -1490,7 +1490,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1522,7 +1522,7 @@ class ScheduleOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationMachineRuns.js b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationMachineRuns.js
index dd36c0ac40..9861f663ab 100644
--- a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationMachineRuns.js
+++ b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationMachineRuns.js
@@ -139,7 +139,7 @@ function _getById(resourceGroupName, automationAccountName, softwareUpdateConfig
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -149,12 +149,13 @@ function _getById(resourceGroupName, automationAccountName, softwareUpdateConfig
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
@@ -339,7 +340,7 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -349,12 +350,13 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
diff --git a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationRuns.js b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationRuns.js
index 825c7c999e..ae6f3084d5 100644
--- a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationRuns.js
+++ b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurationRuns.js
@@ -139,7 +139,7 @@ function _getById(resourceGroupName, automationAccountName, softwareUpdateConfig
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -149,12 +149,13 @@ function _getById(resourceGroupName, automationAccountName, softwareUpdateConfig
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
@@ -338,7 +339,7 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -348,12 +349,13 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
diff --git a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js
index 60620e732a..f22d9985d7 100644
--- a/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js
+++ b/lib/services/automationManagement/lib/operations/softwareUpdateConfigurations.js
@@ -273,7 +273,7 @@ function _create(resourceGroupName, automationAccountName, softwareUpdateConfigu
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 201 && statusCode !== 400 && statusCode !== 404 && statusCode !== 409) {
+    if (statusCode !== 200 && statusCode !== 201) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -283,12 +283,13 @@ function _create(resourceGroupName, automationAccountName, softwareUpdateConfigu
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
@@ -465,7 +466,7 @@ function _getByName(resourceGroupName, automationAccountName, softwareUpdateConf
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -475,12 +476,13 @@ function _getByName(resourceGroupName, automationAccountName, softwareUpdateConf
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
@@ -638,7 +640,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, softwareUpdateC
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 204 && statusCode !== 404) {
+    if (statusCode !== 200 && statusCode !== 204) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -648,12 +650,13 @@ function _deleteMethod(resourceGroupName, automationAccountName, softwareUpdateC
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
@@ -798,7 +801,7 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       return callback(err);
     }
     let statusCode = response.statusCode;
-    if (statusCode !== 200 && statusCode !== 404) {
+    if (statusCode !== 200) {
       let error = new Error(responseBody);
       error.statusCode = response.statusCode;
       error.request = msRest.stripRequest(httpRequest);
@@ -808,12 +811,13 @@ function _list(resourceGroupName, automationAccountName, options, callback) {
       try {
         parsedErrorResponse = JSON.parse(responseBody);
         if (parsedErrorResponse) {
-          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
-          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
-          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
         }
         if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
-          let resultMapper = new client.models['CloudError']().mapper();
+          let resultMapper = new client.models['ErrorResponse']().mapper();
           error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
         }
       } catch (defaultError) {
diff --git a/lib/services/automationManagement/lib/operations/statisticsOperations.js b/lib/services/automationManagement/lib/operations/statisticsOperations.js
index 2d55cd9c03..1a57da8c09 100644
--- a/lib/services/automationManagement/lib/operations/statisticsOperations.js
+++ b/lib/services/automationManagement/lib/operations/statisticsOperations.js
@@ -17,9 +17,9 @@ const WebResource = msRest.WebResource;
 /**
  * Retrieve the statistics for the account.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -59,6 +59,14 @@ function _listByAutomationAccount(resourceGroupName, automationAccountName, opti
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -187,9 +195,9 @@ class StatisticsOperations {
   /**
    * Retrieve the statistics for the account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -221,9 +229,9 @@ class StatisticsOperations {
   /**
    * Retrieve the statistics for the account.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/testJobOperations.js b/lib/services/automationManagement/lib/operations/testJobOperations.js
index ec509a1344..7fa11c73e5 100644
--- a/lib/services/automationManagement/lib/operations/testJobOperations.js
+++ b/lib/services/automationManagement/lib/operations/testJobOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The parameters supplied to the create test job
  * operation.
@@ -210,7 +210,7 @@ function _create(resourceGroupName, automationAccountName, runbookName, paramete
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -374,7 +374,7 @@ function _get(resourceGroupName, automationAccountName, runbookName, options, ca
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -520,7 +520,7 @@ function _resume(resourceGroupName, automationAccountName, runbookName, options,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -666,7 +666,7 @@ function _stop(resourceGroupName, automationAccountName, runbookName, options, c
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -827,7 +827,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the create test job
    * operation.
@@ -871,7 +871,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The parameters supplied to the create test job
    * operation.
@@ -937,7 +937,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -971,7 +971,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1027,7 +1027,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1061,7 +1061,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1116,7 +1116,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1150,7 +1150,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1205,7 +1205,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -1239,7 +1239,7 @@ class TestJobOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
diff --git a/lib/services/automationManagement/lib/operations/testJobStreams.js b/lib/services/automationManagement/lib/operations/testJobStreams.js
index 944809e85b..9feaa152d1 100644
--- a/lib/services/automationManagement/lib/operations/testJobStreams.js
+++ b/lib/services/automationManagement/lib/operations/testJobStreams.js
@@ -20,7 +20,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -190,7 +190,7 @@ function _get(resourceGroupName, automationAccountName, runbookName, jobStreamId
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} runbookName The runbook name.
  *
@@ -505,7 +505,7 @@ class TestJobStreams {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -542,7 +542,7 @@ class TestJobStreams {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -600,7 +600,7 @@ class TestJobStreams {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
@@ -636,7 +636,7 @@ class TestJobStreams {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} runbookName The runbook name.
    *
diff --git a/lib/services/automationManagement/lib/operations/usages.js b/lib/services/automationManagement/lib/operations/usages.js
index b68cfaf78b..3ca7d0955c 100644
--- a/lib/services/automationManagement/lib/operations/usages.js
+++ b/lib/services/automationManagement/lib/operations/usages.js
@@ -17,9 +17,9 @@ const WebResource = msRest.WebResource;
 /**
  * Retrieve the usage for the account id.
  *
- * @param {string} resourceGroupName The resource group name.
+ * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -56,6 +56,14 @@ function _listByAutomationAccount(resourceGroupName, automationAccountName, opti
       throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
     }
     if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
       if (resourceGroupName.match(/^[-\w\._]+$/) === null)
       {
         throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
@@ -178,9 +186,9 @@ class Usages {
   /**
    * Retrieve the usage for the account id.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -210,9 +218,9 @@ class Usages {
   /**
    * Retrieve the usage for the account id.
    *
-   * @param {string} resourceGroupName The resource group name.
+   * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/variableOperations.js b/lib/services/automationManagement/lib/operations/variableOperations.js
index 02e2b78ede..5f7e21d10f 100644
--- a/lib/services/automationManagement/lib/operations/variableOperations.js
+++ b/lib/services/automationManagement/lib/operations/variableOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} variableName The variable name.
  *
@@ -230,7 +230,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, variableName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} variableName The variable name.
  *
@@ -421,7 +421,7 @@ function _update(resourceGroupName, automationAccountName, variableName, paramet
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} variableName The name of variable.
  *
@@ -567,7 +567,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, variableName, o
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} variableName The name of variable.
  *
@@ -731,7 +731,7 @@ function _get(resourceGroupName, automationAccountName, variableName, options, c
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1033,7 +1033,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The variable name.
    *
@@ -1080,7 +1080,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The variable name.
    *
@@ -1149,7 +1149,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The variable name.
    *
@@ -1193,7 +1193,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The variable name.
    *
@@ -1259,7 +1259,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The name of variable.
    *
@@ -1293,7 +1293,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The name of variable.
    *
@@ -1348,7 +1348,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The name of variable.
    *
@@ -1382,7 +1382,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} variableName The name of variable.
    *
@@ -1438,7 +1438,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1470,7 +1470,7 @@ class VariableOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
diff --git a/lib/services/automationManagement/lib/operations/watcherOperations.js b/lib/services/automationManagement/lib/operations/watcherOperations.js
new file mode 100644
index 0000000000..bf2c4b4d8b
--- /dev/null
+++ b/lib/services/automationManagement/lib/operations/watcherOperations.js
@@ -0,0 +1,2114 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const msRest = require('ms-rest');
+const msRestAzure = require('ms-rest-azure');
+const WebResource = msRest.WebResource;
+
+/**
+ * Create the watcher identified by watcher name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} parameters The create or update parameters for watcher.
+ *
+ * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+ * frequency at which the watcher is invoked.
+ *
+ * @param {string} [parameters.scriptName] Gets or sets the name of the script
+ * the watcher is attached to, i.e. the name of an existing runbook.
+ *
+ * @param {object} [parameters.scriptParameters] Gets or sets the parameters of
+ * the script.
+ *
+ * @param {string} [parameters.scriptRunOn] Gets or sets the name of the hybrid
+ * worker group the watcher will run on.
+ *
+ * @param {string} [parameters.description] Gets or sets the description.
+ *
+ * @param {string} [parameters.etag] Gets or sets the etag of the resource.
+ *
+ * @param {object} [parameters.tags] Resource tags.
+ *
+ * @param {string} [parameters.location] The Azure Region where the resource
+ * lives
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object if an error did not occur.
+ *                      See {@link Watcher} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _createOrUpdate(resourceGroupName, automationAccountName, watcherName, parameters, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (parameters === null || parameters === undefined) {
+      throw new Error('parameters cannot be null or undefined.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'PUT';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  // Serialize Request
+  let requestContent = null;
+  let requestModel = null;
+  try {
+    if (parameters !== null && parameters !== undefined) {
+      let requestModelMapper = new client.models['Watcher']().mapper();
+      requestModel = client.serialize(requestModelMapper, parameters, 'parameters');
+      requestContent = JSON.stringify(requestModel);
+    }
+  } catch (error) {
+    let serializationError = new Error(`Error "${error.message}" occurred in serializing the ` +
+        `payload - ${JSON.stringify(parameters, null, 2)}.`);
+    return callback(serializationError);
+  }
+  httpRequest.body = requestContent;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200 && statusCode !== 201) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['Watcher']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+    // Deserialize Response
+    if (statusCode === 201) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['Watcher']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError1 = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError1.request = msRest.stripRequest(httpRequest);
+        deserializationError1.response = msRest.stripResponse(response);
+        return callback(deserializationError1);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Retrieve the watcher identified by watcher name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object if an error did not occur.
+ *                      See {@link Watcher} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _get(resourceGroupName, automationAccountName, watcherName, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['Watcher']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Update the watcher identified by watcher name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} parameters The update parameters for watcher.
+ *
+ * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+ * frequency at which the watcher is invoked.
+ *
+ * @param {string} [parameters.name] Gets or sets the name of the resource.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object if an error did not occur.
+ *                      See {@link Watcher} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _update(resourceGroupName, automationAccountName, watcherName, parameters, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (parameters === null || parameters === undefined) {
+      throw new Error('parameters cannot be null or undefined.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'PATCH';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  // Serialize Request
+  let requestContent = null;
+  let requestModel = null;
+  try {
+    if (parameters !== null && parameters !== undefined) {
+      let requestModelMapper = new client.models['WatcherUpdateParameters']().mapper();
+      requestModel = client.serialize(requestModelMapper, parameters, 'parameters');
+      requestContent = JSON.stringify(requestModel);
+    }
+  } catch (error) {
+    let serializationError = new Error(`Error "${error.message}" occurred in serializing the ` +
+        `payload - ${JSON.stringify(parameters, null, 2)}.`);
+    return callback(serializationError);
+  }
+  httpRequest.body = requestContent;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['Watcher']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Delete the watcher by name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object if an error did not occur.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _deleteMethod(resourceGroupName, automationAccountName, watcherName, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'DELETE';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Resume the watcher identified by watcher name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object if an error did not occur.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _start(resourceGroupName, automationAccountName, watcherName, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}/start';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'POST';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Resume the watcher identified by watcher name.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {string} watcherName The watcher name.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object if an error did not occur.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _stop(resourceGroupName, automationAccountName, watcherName, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (watcherName === null || watcherName === undefined || typeof watcherName.valueOf() !== 'string') {
+      throw new Error('watcherName cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers/{watcherName}/stop';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{watcherName}', encodeURIComponent(watcherName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'POST';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Retrieve a list of watchers.
+ *
+ * @param {string} resourceGroupName Name of an Azure Resource group.
+ *
+ * @param {string} automationAccountName The name of the automation account.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {string} [options.filter] The filter to apply on the operation.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object if an error did not occur.
+ *                      See {@link WatcherListResult} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _listByAutomationAccount(resourceGroupName, automationAccountName, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  let filter = (options && options.filter !== undefined) ? options.filter : undefined;
+  let apiVersion = '2015-10-31';
+  // Validate
+  try {
+    if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
+      throw new Error('resourceGroupName cannot be null or undefined and it must be of type string.');
+    }
+    if (resourceGroupName !== null && resourceGroupName !== undefined) {
+      if (resourceGroupName.length > 90)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MaxLength": 90');
+      }
+      if (resourceGroupName.length < 1)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "MinLength": 1');
+      }
+      if (resourceGroupName.match(/^[-\w\._]+$/) === null)
+      {
+        throw new Error('"resourceGroupName" should satisfy the constraint - "Pattern": /^[-\w\._]+$/');
+      }
+    }
+    if (automationAccountName === null || automationAccountName === undefined || typeof automationAccountName.valueOf() !== 'string') {
+      throw new Error('automationAccountName cannot be null or undefined and it must be of type string.');
+    }
+    if (filter !== null && filter !== undefined && typeof filter.valueOf() !== 'string') {
+      throw new Error('filter must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let baseUrl = this.client.baseUri;
+  let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/watchers';
+  requestUrl = requestUrl.replace('{resourceGroupName}', encodeURIComponent(resourceGroupName));
+  requestUrl = requestUrl.replace('{automationAccountName}', encodeURIComponent(automationAccountName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  let queryParameters = [];
+  if (filter !== null && filter !== undefined) {
+    queryParameters.push('$filter=' + encodeURIComponent(filter));
+  }
+  queryParameters.push('api-version=' + encodeURIComponent(apiVersion));
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['WatcherListResult']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/**
+ * Retrieve a list of watchers.
+ *
+ * @param {string} nextPageLink The NextLink from the previous successful call
+ * to List operation.
+ *
+ * @param {object} [options] Optional Parameters.
+ *
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ *
+ * @param {function} callback - The callback.
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object if an error did not occur.
+ *                      See {@link WatcherListResult} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+function _listByAutomationAccountNext(nextPageLink, options, callback) {
+   /* jshint validthis: true */
+  let client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  // Validate
+  try {
+    if (nextPageLink === null || nextPageLink === undefined || typeof nextPageLink.valueOf() !== 'string') {
+      throw new Error('nextPageLink cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  let requestUrl = '{nextLink}';
+  requestUrl = requestUrl.replace('{nextLink}', nextPageLink);
+
+  // Create HTTP transport objects
+  let httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.url = requestUrl;
+  httpRequest.headers = {};
+  // Set Headers
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(let headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, (err, response, responseBody) => {
+    if (err) {
+      return callback(err);
+    }
+    let statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      let error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      let parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          let internalError = null;
+          if (parsedErrorResponse.error) internalError = parsedErrorResponse.error;
+          error.code = internalError ? internalError.code : parsedErrorResponse.code;
+          error.message = internalError ? internalError.message : parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          let resultMapper = new client.models['ErrorResponse']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = `Error "${defaultError.message}" occurred in deserializing the responseBody ` +
+                         `- "${responseBody}" for the default response.`;
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    let result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      let parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          let resultMapper = new client.models['WatcherListResult']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+}
+
+/** Class representing a WatcherOperations. */
+class WatcherOperations {
+  /**
+   * Create a WatcherOperations.
+   * @param {AutomationClient} client Reference to the service client.
+   */
+  constructor(client) {
+    this.client = client;
+    this._createOrUpdate = _createOrUpdate;
+    this._get = _get;
+    this._update = _update;
+    this._deleteMethod = _deleteMethod;
+    this._start = _start;
+    this._stop = _stop;
+    this._listByAutomationAccount = _listByAutomationAccount;
+    this._listByAutomationAccountNext = _listByAutomationAccountNext;
+  }
+
+  /**
+   * Create the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} parameters The create or update parameters for watcher.
+   *
+   * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+   * frequency at which the watcher is invoked.
+   *
+   * @param {string} [parameters.scriptName] Gets or sets the name of the script
+   * the watcher is attached to, i.e. the name of an existing runbook.
+   *
+   * @param {object} [parameters.scriptParameters] Gets or sets the parameters of
+   * the script.
+   *
+   * @param {string} [parameters.scriptRunOn] Gets or sets the name of the hybrid
+   * worker group the watcher will run on.
+   *
+   * @param {string} [parameters.description] Gets or sets the description.
+   *
+   * @param {string} [parameters.etag] Gets or sets the etag of the resource.
+   *
+   * @param {object} [parameters.tags] Resource tags.
+   *
+   * @param {string} [parameters.location] The Azure Region where the resource
+   * lives
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  createOrUpdateWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, parameters, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._createOrUpdate(resourceGroupName, automationAccountName, watcherName, parameters, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Create the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} parameters The create or update parameters for watcher.
+   *
+   * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+   * frequency at which the watcher is invoked.
+   *
+   * @param {string} [parameters.scriptName] Gets or sets the name of the script
+   * the watcher is attached to, i.e. the name of an existing runbook.
+   *
+   * @param {object} [parameters.scriptParameters] Gets or sets the parameters of
+   * the script.
+   *
+   * @param {string} [parameters.scriptRunOn] Gets or sets the name of the hybrid
+   * worker group the watcher will run on.
+   *
+   * @param {string} [parameters.description] Gets or sets the description.
+   *
+   * @param {string} [parameters.etag] Gets or sets the etag of the resource.
+   *
+   * @param {object} [parameters.tags] Resource tags.
+   *
+   * @param {string} [parameters.location] The Azure Region where the resource
+   * lives
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {Watcher} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {object} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link Watcher} for more information.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  createOrUpdate(resourceGroupName, automationAccountName, watcherName, parameters, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._createOrUpdate(resourceGroupName, automationAccountName, watcherName, parameters, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._createOrUpdate(resourceGroupName, automationAccountName, watcherName, parameters, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Retrieve the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  getWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._get(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Retrieve the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {Watcher} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {object} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link Watcher} for more information.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  get(resourceGroupName, automationAccountName, watcherName, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._get(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._get(resourceGroupName, automationAccountName, watcherName, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Update the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} parameters The update parameters for watcher.
+   *
+   * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+   * frequency at which the watcher is invoked.
+   *
+   * @param {string} [parameters.name] Gets or sets the name of the resource.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<Watcher>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  updateWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, parameters, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._update(resourceGroupName, automationAccountName, watcherName, parameters, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Update the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} parameters The update parameters for watcher.
+   *
+   * @param {number} [parameters.executionFrequencyInSeconds] Gets or sets the
+   * frequency at which the watcher is invoked.
+   *
+   * @param {string} [parameters.name] Gets or sets the name of the resource.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {Watcher} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {object} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link Watcher} for more information.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  update(resourceGroupName, automationAccountName, watcherName, parameters, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._update(resourceGroupName, automationAccountName, watcherName, parameters, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._update(resourceGroupName, automationAccountName, watcherName, parameters, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Delete the watcher by name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  deleteMethodWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._deleteMethod(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Delete the watcher by name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {null} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {null} [result]   - The deserialized result object if an error did not occur.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  deleteMethod(resourceGroupName, automationAccountName, watcherName, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._deleteMethod(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._deleteMethod(resourceGroupName, automationAccountName, watcherName, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Resume the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  startWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._start(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Resume the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {null} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {null} [result]   - The deserialized result object if an error did not occur.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  start(resourceGroupName, automationAccountName, watcherName, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._start(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._start(resourceGroupName, automationAccountName, watcherName, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Resume the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<null>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  stopWithHttpOperationResponse(resourceGroupName, automationAccountName, watcherName, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._stop(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Resume the watcher identified by watcher name.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {string} watcherName The watcher name.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {null} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {null} [result]   - The deserialized result object if an error did not occur.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  stop(resourceGroupName, automationAccountName, watcherName, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._stop(resourceGroupName, automationAccountName, watcherName, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._stop(resourceGroupName, automationAccountName, watcherName, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Retrieve a list of watchers.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {string} [options.filter] The filter to apply on the operation.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<WatcherListResult>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  listByAutomationAccountWithHttpOperationResponse(resourceGroupName, automationAccountName, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._listByAutomationAccount(resourceGroupName, automationAccountName, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Retrieve a list of watchers.
+   *
+   * @param {string} resourceGroupName Name of an Azure Resource group.
+   *
+   * @param {string} automationAccountName The name of the automation account.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {string} [options.filter] The filter to apply on the operation.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {WatcherListResult} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {object} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link WatcherListResult} for more information.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  listByAutomationAccount(resourceGroupName, automationAccountName, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._listByAutomationAccount(resourceGroupName, automationAccountName, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._listByAutomationAccount(resourceGroupName, automationAccountName, options, optionalCallback);
+    }
+  }
+
+  /**
+   * Retrieve a list of watchers.
+   *
+   * @param {string} nextPageLink The NextLink from the previous successful call
+   * to List operation.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @returns {Promise} A promise is returned
+   *
+   * @resolve {HttpOperationResponse<WatcherListResult>} - The deserialized result object.
+   *
+   * @reject {Error} - The error object.
+   */
+  listByAutomationAccountNextWithHttpOperationResponse(nextPageLink, options) {
+    let client = this.client;
+    let self = this;
+    return new Promise((resolve, reject) => {
+      self._listByAutomationAccountNext(nextPageLink, options, (err, result, request, response) => {
+        let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
+        httpOperationResponse.body = result;
+        if (err) { reject(err); }
+        else { resolve(httpOperationResponse); }
+        return;
+      });
+    });
+  }
+
+  /**
+   * Retrieve a list of watchers.
+   *
+   * @param {string} nextPageLink The NextLink from the previous successful call
+   * to List operation.
+   *
+   * @param {object} [options] Optional Parameters.
+   *
+   * @param {object} [options.customHeaders] Headers that will be added to the
+   * request
+   *
+   * @param {function} [optionalCallback] - The optional callback.
+   *
+   * @returns {function|Promise} If a callback was passed as the last parameter
+   * then it returns the callback else returns a Promise.
+   *
+   * {Promise} A promise is returned
+   *
+   *                      @resolve {WatcherListResult} - The deserialized result object.
+   *
+   *                      @reject {Error} - The error object.
+   *
+   * {function} optionalCallback(err, result, request, response)
+   *
+   *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+   *
+   *                      {object} [result]   - The deserialized result object if an error did not occur.
+   *                      See {@link WatcherListResult} for more information.
+   *
+   *                      {object} [request]  - The HTTP Request object if an error did not occur.
+   *
+   *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+   */
+  listByAutomationAccountNext(nextPageLink, options, optionalCallback) {
+    let client = this.client;
+    let self = this;
+    if (!optionalCallback && typeof options === 'function') {
+      optionalCallback = options;
+      options = null;
+    }
+    if (!optionalCallback) {
+      return new Promise((resolve, reject) => {
+        self._listByAutomationAccountNext(nextPageLink, options, (err, result, request, response) => {
+          if (err) { reject(err); }
+          else { resolve(result); }
+          return;
+        });
+      });
+    } else {
+      return self._listByAutomationAccountNext(nextPageLink, options, optionalCallback);
+    }
+  }
+
+}
+
+module.exports = WatcherOperations;
diff --git a/lib/services/automationManagement/lib/operations/webhookOperations.js b/lib/services/automationManagement/lib/operations/webhookOperations.js
index d80da18620..23f19e7f6c 100644
--- a/lib/services/automationManagement/lib/operations/webhookOperations.js
+++ b/lib/services/automationManagement/lib/operations/webhookOperations.js
@@ -19,7 +19,7 @@ const WebResource = msRest.WebResource;
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -182,7 +182,7 @@ function _generateUri(resourceGroupName, automationAccountName, options, callbac
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} webhookName The webhook name.
  *
@@ -328,7 +328,7 @@ function _deleteMethod(resourceGroupName, automationAccountName, webhookName, op
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} webhookName The webhook name.
  *
@@ -492,7 +492,7 @@ function _get(resourceGroupName, automationAccountName, webhookName, options, ca
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} webhookName The webhook name.
  *
@@ -712,7 +712,7 @@ function _createOrUpdate(resourceGroupName, automationAccountName, webhookName,
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {string} webhookName The webhook name.
  *
@@ -909,7 +909,7 @@ function _update(resourceGroupName, automationAccountName, webhookName, paramete
  *
  * @param {string} resourceGroupName Name of an Azure Resource group.
  *
- * @param {string} automationAccountName The automation account name.
+ * @param {string} automationAccountName The name of the automation account.
  *
  * @param {object} [options] Optional Parameters.
  *
@@ -1221,7 +1221,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1253,7 +1253,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1306,7 +1306,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1340,7 +1340,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1395,7 +1395,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1429,7 +1429,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1485,7 +1485,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1541,7 +1541,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1619,7 +1619,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1669,7 +1669,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {string} webhookName The webhook name.
    *
@@ -1741,7 +1741,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *
@@ -1775,7 +1775,7 @@ class WebhookOperations {
    *
    * @param {string} resourceGroupName Name of an Azure Resource group.
    *
-   * @param {string} automationAccountName The automation account name.
+   * @param {string} automationAccountName The name of the automation account.
    *
    * @param {object} [options] Optional Parameters.
    *