diff --git a/packages/@azure/arm-policyinsights/lib/models/index.ts b/packages/@azure/arm-policyinsights/lib/models/index.ts
index 81eb76fc4a39..ccf847d66850 100644
--- a/packages/@azure/arm-policyinsights/lib/models/index.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/index.ts
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
@@ -11,1254 +13,1665 @@ import * as msRest from "@azure/ms-rest-js";
 
 export { BaseResource, CloudError };
 
+
 /**
+ * @interface
+ * An interface representing PolicyDetails.
  * The policy details.
+ *
  */
 export interface PolicyDetails {
   /**
-   * The ID of the policy definition.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policyDefinitionId] The ID of the policy definition.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyDefinitionId?: string;
   /**
-   * The ID of the policy assignment.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policyAssignmentId] The ID of the policy assignment.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyAssignmentId?: string;
   /**
-   * The display name of the policy assignment.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policyAssignmentDisplayName] The display name of the
+   * policy assignment.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyAssignmentDisplayName?: string;
   /**
-   * The scope of the policy assignment.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policyAssignmentScope] The scope of the policy
+   * assignment.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyAssignmentScope?: string;
   /**
-   * The ID of the policy set definition.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policySetDefinitionId] The ID of the policy set
+   * definition.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policySetDefinitionId?: string;
   /**
-   * The policy definition reference ID within the policy set definition.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [policyDefinitionReferenceId] The policy definition
+   * reference ID within the policy set definition.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyDefinitionReferenceId?: string;
 }
 
 /**
- * The details of the policy triggered deployment that created or modified the tracked resource.
+ * @interface
+ * An interface representing TrackedResourceModificationDetails.
+ * The details of the policy triggered deployment that created or modified the
+ * tracked resource.
+ *
  */
 export interface TrackedResourceModificationDetails {
   /**
-   * The details of the policy that created or modified the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {PolicyDetails} [policyDetails] The details of the policy that
+   * created or modified the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyDetails?: PolicyDetails;
   /**
-   * The ID of the deployment that created or modified the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [deploymentId] The ID of the deployment that created or
+   * modified the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly deploymentId?: string;
   /**
-   * Timestamp of the deployment that created or modified the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [deploymentTime] Timestamp of the deployment that created
+   * or modified the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly deploymentTime?: Date;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyTrackedResource.
  * Policy tracked resource record.
+ *
  */
 export interface PolicyTrackedResource {
   /**
-   * The ID of the policy tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [trackedResourceId] The ID of the policy tracked
+   * resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly trackedResourceId?: string;
   /**
-   * The details of the policy that require the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {PolicyDetails} [policyDetails] The details of the policy that
+   * require the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly policyDetails?: PolicyDetails;
   /**
-   * The details of the policy triggered deployment that created the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {TrackedResourceModificationDetails} [createdBy] The details of
+   * the policy triggered deployment that created the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly createdBy?: TrackedResourceModificationDetails;
   /**
-   * The details of the policy triggered deployment that modified the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {TrackedResourceModificationDetails} [lastModifiedBy] The details
+   * of the policy triggered deployment that modified the tracked resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly lastModifiedBy?: TrackedResourceModificationDetails;
   /**
-   * Timestamp of the last update to the tracked resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [lastUpdateUtc] Timestamp of the last update to the tracked
+   * resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly lastUpdateUtc?: Date;
 }
 
 /**
+ * @interface
+ * An interface representing QueryFailureError.
  * Error definition.
+ *
  */
 export interface QueryFailureError {
   /**
-   * Service specific error code which serves as the substatus for the HTTP error code.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [code] Service specific error code which serves as the
+   * substatus for the HTTP error code.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly code?: string;
   /**
-   * Description of the error.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [message] Description of the error.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly message?: string;
 }
 
 /**
+ * @interface
+ * An interface representing QueryFailure.
  * Error response.
+ *
  */
 export interface QueryFailure {
   /**
-   * Error definition.
+   * @member {QueryFailureError} [error] Error definition.
    */
   error?: QueryFailureError;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationFilters.
  * The filters that will be applied to determine which resources to remediate.
+ *
  */
 export interface RemediationFilters {
   /**
-   * The resource locations that will be remediated.
+   * @member {string[]} [locations] The resource locations that will be
+   * remediated.
    */
   locations?: string[];
 }
 
 /**
- * The deployment status summary for all deployments created by the remediation.
+ * @interface
+ * An interface representing RemediationDeploymentSummary.
+ * The deployment status summary for all deployments created by the
+ * remediation.
+ *
  */
 export interface RemediationDeploymentSummary {
   /**
-   * The number of deployments required by the remediation.
+   * @member {number} [totalDeployments] The number of deployments required by
+   * the remediation.
    */
   totalDeployments?: number;
   /**
-   * The number of deployments required by the remediation that have succeeded.
+   * @member {number} [successfulDeployments] The number of deployments
+   * required by the remediation that have succeeded.
    */
   successfulDeployments?: number;
   /**
-   * The number of deployments required by the remediation that have failed.
+   * @member {number} [failedDeployments] The number of deployments required by
+   * the remediation that have failed.
    */
   failedDeployments?: number;
 }
 
 /**
+ * @interface
+ * An interface representing Remediation.
  * The remediation definition.
+ *
+ * @extends BaseResource
  */
 export interface Remediation extends BaseResource {
   /**
-   * The resource ID of the policy assignment that should be remediated.
+   * @member {string} [policyAssignmentId] The resource ID of the policy
+   * assignment that should be remediated.
    */
   policyAssignmentId?: string;
   /**
-   * The policy definition reference ID of the individual definition that should be remediated.
-   * Required when the policy assignment being remediated assigns a policy set definition.
+   * @member {string} [policyDefinitionReferenceId] The policy definition
+   * reference ID of the individual definition that should be remediated.
+   * Required when the policy assignment being remediated assigns a policy set
+   * definition.
    */
   policyDefinitionReferenceId?: string;
   /**
-   * The status of the remediation.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [provisioningState] The status of the remediation.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly provisioningState?: string;
   /**
-   * The time at which the remediation was created.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [createdOn] The time at which the remediation was created.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly createdOn?: Date;
   /**
-   * The time at which the remediation was last updated.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [lastUpdatedOn] The time at which the remediation was last
+   * updated.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly lastUpdatedOn?: Date;
   /**
-   * The filters that will be applied to determine which resources to remediate.
+   * @member {RemediationFilters} [filters] The filters that will be applied to
+   * determine which resources to remediate.
    */
   filters?: RemediationFilters;
   /**
-   * The deployment status summary for all deployments created by the remediation.
+   * @member {RemediationDeploymentSummary} [deploymentStatus] The deployment
+   * status summary for all deployments created by the remediation.
    */
   deploymentStatus?: RemediationDeploymentSummary;
   /**
-   * The ID of the remediation.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [id] The ID of the remediation.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly id?: string;
   /**
-   * The type of the remediation.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [type] The type of the remediation.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly type?: string;
   /**
-   * The name of the remediation.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [name] The name of the remediation.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly name?: string;
 }
 
 /**
+ * @interface
+ * An interface representing TypedErrorInfo.
  * Scenario specific error details.
+ *
  */
 export interface TypedErrorInfo {
   /**
-   * The type of included error details.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [type] The type of included error details.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly type?: string;
   /**
-   * The scenario specific error details.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {any} [info] The scenario specific error details.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly info?: any;
 }
 
 /**
+ * @interface
+ * An interface representing ErrorDefinition.
  * Error definition.
+ *
  */
 export interface ErrorDefinition {
   /**
-   * Service specific error code which serves as the substatus for the HTTP error code.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [code] Service specific error code which serves as the
+   * substatus for the HTTP error code.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly code?: string;
   /**
-   * Description of the error.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [message] Description of the error.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly message?: string;
   /**
-   * The target of the error.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [target] The target of the error.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly target?: string;
   /**
-   * Internal error details.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {ErrorDefinition[]} [details] Internal error details.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly details?: ErrorDefinition[];
   /**
-   * Additional scenario specific error details.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {TypedErrorInfo[]} [additionalInfo] Additional scenario specific
+   * error details.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly additionalInfo?: TypedErrorInfo[];
 }
 
 /**
+ * @interface
+ * An interface representing RemediationDeployment.
  * Details of a single deployment created by the remediation.
+ *
  */
 export interface RemediationDeployment {
   /**
-   * Resource ID of the resource that is being remediated by the deployment.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [remediatedResourceId] Resource ID of the resource that
+   * is being remediated by the deployment.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly remediatedResourceId?: string;
   /**
-   * Resource ID of the template deployment that will remediate the resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [deploymentId] Resource ID of the template deployment
+   * that will remediate the resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly deploymentId?: string;
   /**
-   * Status of the remediation deployment.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [status] Status of the remediation deployment.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly status?: string;
   /**
-   * Location of the resource that is being remediated.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [resourceLocation] Location of the resource that is being
+   * remediated.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly resourceLocation?: string;
   /**
-   * Error encountered while remediated the resource.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {ErrorDefinition} [error] Error encountered while remediated the
+   * resource.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly error?: ErrorDefinition;
   /**
-   * The time at which the remediation was created.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [createdOn] The time at which the remediation was created.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly createdOn?: Date;
   /**
-   * The time at which the remediation deployment was last updated.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {Date} [lastUpdatedOn] The time at which the remediation
+   * deployment was last updated.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly lastUpdatedOn?: Date;
 }
 
 /**
+ * @interface
+ * An interface representing ErrorResponse.
  * Error response.
+ *
  */
 export interface ErrorResponse {
   /**
-   * The error details.
+   * @member {ErrorDefinition} [error] The error details.
    */
   error?: ErrorDefinition;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEvent.
  * Policy event record.
+ *
  */
 export interface PolicyEvent {
   /**
-   * OData entity ID; always set to null since policy event records do not have an entity ID.
+   * @member {string} [odataid] OData entity ID; always set to null since
+   * policy event records do not have an entity ID.
    */
   odataid?: string;
   /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
    */
   odatacontext?: string;
   /**
-   * Timestamp for the policy event record.
+   * @member {Date} [timestamp] Timestamp for the policy event record.
    */
   timestamp?: Date;
   /**
-   * Resource ID.
+   * @member {string} [resourceId] Resource ID.
    */
   resourceId?: string;
   /**
-   * Policy assignment ID.
+   * @member {string} [policyAssignmentId] Policy assignment ID.
    */
   policyAssignmentId?: string;
   /**
-   * Policy definition ID.
+   * @member {string} [policyDefinitionId] Policy definition ID.
    */
   policyDefinitionId?: string;
   /**
-   * Effective parameters for the policy assignment.
+   * @member {string} [effectiveParameters] Effective parameters for the policy
+   * assignment.
    */
   effectiveParameters?: string;
   /**
-   * Flag which states whether the resource is compliant against the policy assignment it was
-   * evaluated against.
+   * @member {boolean} [isCompliant] Flag which states whether the resource is
+   * compliant against the policy assignment it was evaluated against.
    */
   isCompliant?: boolean;
   /**
-   * Subscription ID.
+   * @member {string} [subscriptionId] Subscription ID.
    */
   subscriptionId?: string;
   /**
-   * Resource type.
+   * @member {string} [resourceType] Resource type.
    */
   resourceType?: string;
   /**
-   * Resource location.
+   * @member {string} [resourceLocation] Resource location.
    */
   resourceLocation?: string;
   /**
-   * Resource group name.
+   * @member {string} [resourceGroup] Resource group name.
    */
   resourceGroup?: string;
   /**
-   * List of resource tags.
+   * @member {string} [resourceTags] List of resource tags.
    */
   resourceTags?: string;
   /**
-   * Policy assignment name.
+   * @member {string} [policyAssignmentName] Policy assignment name.
    */
   policyAssignmentName?: string;
   /**
-   * Policy assignment owner.
+   * @member {string} [policyAssignmentOwner] Policy assignment owner.
    */
   policyAssignmentOwner?: string;
   /**
-   * Policy assignment parameters.
+   * @member {string} [policyAssignmentParameters] Policy assignment
+   * parameters.
    */
   policyAssignmentParameters?: string;
   /**
-   * Policy assignment scope.
+   * @member {string} [policyAssignmentScope] Policy assignment scope.
    */
   policyAssignmentScope?: string;
   /**
-   * Policy definition name.
+   * @member {string} [policyDefinitionName] Policy definition name.
    */
   policyDefinitionName?: string;
   /**
-   * Policy definition action, i.e. effect.
+   * @member {string} [policyDefinitionAction] Policy definition action, i.e.
+   * effect.
    */
   policyDefinitionAction?: string;
   /**
-   * Policy definition category.
+   * @member {string} [policyDefinitionCategory] Policy definition category.
    */
   policyDefinitionCategory?: string;
   /**
-   * Policy set definition ID, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionId] Policy set definition ID, if the
+   * policy assignment is for a policy set.
    */
   policySetDefinitionId?: string;
   /**
-   * Policy set definition name, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionName] Policy set definition name, if
+   * the policy assignment is for a policy set.
    */
   policySetDefinitionName?: string;
   /**
-   * Policy set definition owner, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionOwner] Policy set definition owner,
+   * if the policy assignment is for a policy set.
    */
   policySetDefinitionOwner?: string;
   /**
-   * Policy set definition category, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionCategory] Policy set definition
+   * category, if the policy assignment is for a policy set.
    */
   policySetDefinitionCategory?: string;
   /**
-   * Policy set definition parameters, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionParameters] Policy set definition
+   * parameters, if the policy assignment is for a policy set.
    */
   policySetDefinitionParameters?: string;
   /**
-   * Comma separated list of management group IDs, which represent the hierarchy of the management
-   * groups the resource is under.
+   * @member {string} [managementGroupIds] Comma separated list of management
+   * group IDs, which represent the hierarchy of the management groups the
+   * resource is under.
    */
   managementGroupIds?: string;
   /**
-   * Reference ID for the policy definition inside the policy set, if the policy assignment is for
-   * a policy set.
+   * @member {string} [policyDefinitionReferenceId] Reference ID for the policy
+   * definition inside the policy set, if the policy assignment is for a policy
+   * set.
    */
   policyDefinitionReferenceId?: string;
   /**
-   * Tenant ID for the policy event record.
+   * @member {string} [tenantId] Tenant ID for the policy event record.
    */
   tenantId?: string;
   /**
-   * Principal object ID for the user who initiated the resource operation that triggered the
-   * policy event.
+   * @member {string} [principalOid] Principal object ID for the user who
+   * initiated the resource operation that triggered the policy event.
    */
   principalOid?: string;
   /**
-   * Describes unknown properties. The value of an unknown property can be of "any" type.
+   * @property Describes unknown properties. The value of an unknown property
+   * can be of "any" type.
    */
   [property: string]: any;
 }
 
 /**
- * Query results.
- */
-export interface PolicyEventsQueryResults {
-  /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
-   */
-  odatacontext?: string;
-  /**
-   * OData entity count; represents the number of policy event records returned.
-   */
-  odatacount?: number;
-  /**
-   * Query results.
-   */
-  value?: PolicyEvent[];
-}
-
-/**
+ * @interface
+ * An interface representing ExpressionEvaluationDetails.
  * Evaluation details of policy language expressions.
+ *
  */
 export interface ExpressionEvaluationDetails {
   /**
-   * Evaluation result.
+   * @member {string} [result] Evaluation result.
    */
   result?: string;
   /**
-   * Expression evaluated.
+   * @member {string} [expression] Expression evaluated.
    */
   expression?: string;
   /**
-   * Property path if the expression is a field or an alias.
+   * @member {string} [path] Property path if the expression is a field or an
+   * alias.
    */
   path?: string;
   /**
-   * Value of the expression.
+   * @member {string} [expressionValue] Value of the expression.
    */
   expressionValue?: string;
   /**
-   * Target value to be compared with the expression value.
+   * @member {string} [targetValue] Target value to be compared with the
+   * expression value.
    */
   targetValue?: string;
   /**
-   * Operator to compare the expression value and the target value.
+   * @member {string} [operator] Operator to compare the expression value and
+   * the target value.
    */
   operator?: string;
 }
 
 /**
+ * @interface
+ * An interface representing IfNotExistsEvaluationDetails.
  * Evaluation details of IfNotExists effect.
+ *
  */
 export interface IfNotExistsEvaluationDetails {
   /**
-   * ID of the last evaluated resource for IfNotExists effect.
+   * @member {string} [resourceId] ID of the last evaluated resource for
+   * IfNotExists effect.
    */
   resourceId?: string;
   /**
-   * Total number of resources to which the existence condition is applicable.
+   * @member {number} [totalResources] Total number of resources to which the
+   * existence condition is applicable.
    */
   totalResources?: number;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEvaluationDetails.
  * Policy evaluation details.
+ *
  */
 export interface PolicyEvaluationDetails {
   /**
-   * Details of the evaluated expressions.
+   * @member {ExpressionEvaluationDetails[]} [evaluatedExpressions] Details of
+   * the evaluated expressions.
    */
   evaluatedExpressions?: ExpressionEvaluationDetails[];
   /**
-   * Evaluation details of IfNotExists effect.
+   * @member {IfNotExistsEvaluationDetails} [ifNotExistsDetails] Evaluation
+   * details of IfNotExists effect.
    */
   ifNotExistsDetails?: IfNotExistsEvaluationDetails;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyState.
  * Policy state record.
+ *
  */
 export interface PolicyState {
   /**
-   * OData entity ID; always set to null since policy state records do not have an entity ID.
+   * @member {string} [odataid] OData entity ID; always set to null since
+   * policy state records do not have an entity ID.
    */
   odataid?: string;
   /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
    */
   odatacontext?: string;
   /**
-   * Timestamp for the policy state record.
+   * @member {Date} [timestamp] Timestamp for the policy state record.
    */
   timestamp?: Date;
   /**
-   * Resource ID.
+   * @member {string} [resourceId] Resource ID.
    */
   resourceId?: string;
   /**
-   * Policy assignment ID.
+   * @member {string} [policyAssignmentId] Policy assignment ID.
    */
   policyAssignmentId?: string;
   /**
-   * Policy definition ID.
+   * @member {string} [policyDefinitionId] Policy definition ID.
    */
   policyDefinitionId?: string;
   /**
-   * Effective parameters for the policy assignment.
+   * @member {string} [effectiveParameters] Effective parameters for the policy
+   * assignment.
    */
   effectiveParameters?: string;
   /**
-   * Flag which states whether the resource is compliant against the policy assignment it was
-   * evaluated against.
+   * @member {boolean} [isCompliant] Flag which states whether the resource is
+   * compliant against the policy assignment it was evaluated against.
    */
   isCompliant?: boolean;
   /**
-   * Subscription ID.
+   * @member {string} [subscriptionId] Subscription ID.
    */
   subscriptionId?: string;
   /**
-   * Resource type.
+   * @member {string} [resourceType] Resource type.
    */
   resourceType?: string;
   /**
-   * Resource location.
+   * @member {string} [resourceLocation] Resource location.
    */
   resourceLocation?: string;
   /**
-   * Resource group name.
+   * @member {string} [resourceGroup] Resource group name.
    */
   resourceGroup?: string;
   /**
-   * List of resource tags.
+   * @member {string} [resourceTags] List of resource tags.
    */
   resourceTags?: string;
   /**
-   * Policy assignment name.
+   * @member {string} [policyAssignmentName] Policy assignment name.
    */
   policyAssignmentName?: string;
   /**
-   * Policy assignment owner.
+   * @member {string} [policyAssignmentOwner] Policy assignment owner.
    */
   policyAssignmentOwner?: string;
   /**
-   * Policy assignment parameters.
+   * @member {string} [policyAssignmentParameters] Policy assignment
+   * parameters.
    */
   policyAssignmentParameters?: string;
   /**
-   * Policy assignment scope.
+   * @member {string} [policyAssignmentScope] Policy assignment scope.
    */
   policyAssignmentScope?: string;
   /**
-   * Policy definition name.
+   * @member {string} [policyDefinitionName] Policy definition name.
    */
   policyDefinitionName?: string;
   /**
-   * Policy definition action, i.e. effect.
+   * @member {string} [policyDefinitionAction] Policy definition action, i.e.
+   * effect.
    */
   policyDefinitionAction?: string;
   /**
-   * Policy definition category.
+   * @member {string} [policyDefinitionCategory] Policy definition category.
    */
   policyDefinitionCategory?: string;
   /**
-   * Policy set definition ID, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionId] Policy set definition ID, if the
+   * policy assignment is for a policy set.
    */
   policySetDefinitionId?: string;
   /**
-   * Policy set definition name, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionName] Policy set definition name, if
+   * the policy assignment is for a policy set.
    */
   policySetDefinitionName?: string;
   /**
-   * Policy set definition owner, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionOwner] Policy set definition owner,
+   * if the policy assignment is for a policy set.
    */
   policySetDefinitionOwner?: string;
   /**
-   * Policy set definition category, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionCategory] Policy set definition
+   * category, if the policy assignment is for a policy set.
    */
   policySetDefinitionCategory?: string;
   /**
-   * Policy set definition parameters, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionParameters] Policy set definition
+   * parameters, if the policy assignment is for a policy set.
    */
   policySetDefinitionParameters?: string;
   /**
-   * Comma separated list of management group IDs, which represent the hierarchy of the management
-   * groups the resource is under.
+   * @member {string} [managementGroupIds] Comma separated list of management
+   * group IDs, which represent the hierarchy of the management groups the
+   * resource is under.
    */
   managementGroupIds?: string;
   /**
-   * Reference ID for the policy definition inside the policy set, if the policy assignment is for
-   * a policy set.
+   * @member {string} [policyDefinitionReferenceId] Reference ID for the policy
+   * definition inside the policy set, if the policy assignment is for a policy
+   * set.
    */
   policyDefinitionReferenceId?: string;
   /**
-   * Compliance state of the resource.
+   * @member {string} [complianceState] Compliance state of the resource.
    */
   complianceState?: string;
   /**
-   * Policy evaluation details.
+   * @member {PolicyEvaluationDetails} [policyEvaluationDetails] Policy
+   * evaluation details.
    */
   policyEvaluationDetails?: PolicyEvaluationDetails;
   /**
-   * Describes unknown properties. The value of an unknown property can be of "any" type.
+   * @property Describes unknown properties. The value of an unknown property
+   * can be of "any" type.
    */
   [property: string]: any;
 }
 
 /**
- * Query results.
- */
-export interface PolicyStatesQueryResults {
-  /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
-   */
-  odatacontext?: string;
-  /**
-   * OData entity count; represents the number of policy state records returned.
-   */
-  odatacount?: number;
-  /**
-   * Query results.
-   */
-  value?: PolicyState[];
-}
-
-/**
+ * @interface
+ * An interface representing SummaryResults.
  * Non-compliance summary on a particular summary level.
+ *
  */
 export interface SummaryResults {
   /**
-   * HTTP POST URI for queryResults action on Microsoft.PolicyInsights to retrieve raw results for
-   * the non-compliance summary.
+   * @member {string} [queryResultsUri] HTTP POST URI for queryResults action
+   * on Microsoft.PolicyInsights to retrieve raw results for the non-compliance
+   * summary.
    */
   queryResultsUri?: string;
   /**
-   * Number of non-compliant resources.
+   * @member {number} [nonCompliantResources] Number of non-compliant
+   * resources.
    */
   nonCompliantResources?: number;
   /**
-   * Number of non-compliant policies.
+   * @member {number} [nonCompliantPolicies] Number of non-compliant policies.
    */
   nonCompliantPolicies?: number;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyDefinitionSummary.
  * Policy definition summary.
+ *
  */
 export interface PolicyDefinitionSummary {
   /**
-   * Policy definition ID.
+   * @member {string} [policyDefinitionId] Policy definition ID.
    */
   policyDefinitionId?: string;
   /**
-   * Policy definition reference ID.
+   * @member {string} [policyDefinitionReferenceId] Policy definition reference
+   * ID.
    */
   policyDefinitionReferenceId?: string;
   /**
-   * Policy effect, i.e. policy definition action.
+   * @member {string} [effect] Policy effect, i.e. policy definition action.
    */
   effect?: string;
   /**
-   * Non-compliance summary for the policy definition.
+   * @member {SummaryResults} [results] Non-compliance summary for the policy
+   * definition.
    */
   results?: SummaryResults;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyAssignmentSummary.
  * Policy assignment summary.
+ *
  */
 export interface PolicyAssignmentSummary {
   /**
-   * Policy assignment ID.
+   * @member {string} [policyAssignmentId] Policy assignment ID.
    */
   policyAssignmentId?: string;
   /**
-   * Policy set definition ID, if the policy assignment is for a policy set.
+   * @member {string} [policySetDefinitionId] Policy set definition ID, if the
+   * policy assignment is for a policy set.
    */
   policySetDefinitionId?: string;
   /**
-   * Non-compliance summary for the policy assignment.
+   * @member {SummaryResults} [results] Non-compliance summary for the policy
+   * assignment.
    */
   results?: SummaryResults;
   /**
-   * Policy definitions summary.
+   * @member {PolicyDefinitionSummary[]} [policyDefinitions] Policy definitions
+   * summary.
    */
   policyDefinitions?: PolicyDefinitionSummary[];
 }
 
 /**
+ * @interface
+ * An interface representing Summary.
  * Summary results.
+ *
  */
 export interface Summary {
   /**
-   * OData entity ID; always set to null since summaries do not have an entity ID.
+   * @member {string} [odataid] OData entity ID; always set to null since
+   * summaries do not have an entity ID.
    */
   odataid?: string;
   /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
    */
   odatacontext?: string;
   /**
-   * Non-compliance summary for all policy assignments.
+   * @member {SummaryResults} [results] Non-compliance summary for all policy
+   * assignments.
    */
   results?: SummaryResults;
   /**
-   * Policy assignments summary.
+   * @member {PolicyAssignmentSummary[]} [policyAssignments] Policy assignments
+   * summary.
    */
   policyAssignments?: PolicyAssignmentSummary[];
 }
 
 /**
+ * @interface
+ * An interface representing SummarizeResults.
  * Summarize action results.
+ *
  */
 export interface SummarizeResults {
   /**
-   * OData context string; used by OData clients to resolve type information based on metadata.
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
    */
   odatacontext?: string;
   /**
-   * OData entity count; represents the number of summaries returned; always set to 1.
+   * @member {number} [odatacount] OData entity count; represents the number of
+   * summaries returned; always set to 1.
    */
   odatacount?: number;
   /**
-   * Summarize action results.
+   * @member {Summary[]} [value] Summarize action results.
    */
   value?: Summary[];
 }
 
 /**
+ * @interface
+ * An interface representing OperationDisplay.
  * Display metadata associated with the operation.
+ *
  */
 export interface OperationDisplay {
   /**
-   * Resource provider name.
+   * @member {string} [provider] Resource provider name.
    */
   provider?: string;
   /**
-   * Resource name on which the operation is performed.
+   * @member {string} [resource] Resource name on which the operation is
+   * performed.
    */
   resource?: string;
   /**
-   * Operation name.
+   * @member {string} [operation] Operation name.
    */
   operation?: string;
   /**
-   * Operation description.
+   * @member {string} [description] Operation description.
    */
   description?: string;
 }
 
 /**
+ * @interface
+ * An interface representing Operation.
  * Operation definition.
+ *
  */
 export interface Operation {
   /**
-   * Operation name.
+   * @member {string} [name] Operation name.
    */
   name?: string;
   /**
-   * Display metadata associated with the operation.
+   * @member {OperationDisplay} [display] Display metadata associated with the
+   * operation.
    */
   display?: OperationDisplay;
 }
 
 /**
+ * @interface
+ * An interface representing OperationsListResults.
  * List of available operations.
+ *
  */
 export interface OperationsListResults {
   /**
-   * OData entity count; represents the number of operations returned.
+   * @member {number} [odatacount] OData entity count; represents the number of
+   * operations returned.
    */
   odatacount?: number;
   /**
-   * List of available operations.
+   * @member {Operation[]} [value] List of available operations.
    */
   value?: Operation[];
 }
 
 /**
+ * @interface
+ * An interface representing QueryOptions.
  * Additional parameters for a set of operations.
+ *
  */
 export interface QueryOptions {
   /**
-   * Maximum number of records to return.
+   * @member {number} [top] Maximum number of records to return.
    */
   top?: number;
   /**
-   * OData filter expression.
+   * @member {string} [filter] OData filter expression.
    */
   filter?: string;
   /**
-   * Ordering expression using OData notation. One or more comma-separated column names with an
-   * optional "desc" (the default) or "asc", e.g. "$orderby=PolicyAssignmentId, ResourceId asc".
+   * @member {string} [orderBy] Ordering expression using OData notation. One
+   * or more comma-separated column names with an optional "desc" (the default)
+   * or "asc", e.g. "$orderby=PolicyAssignmentId, ResourceId asc".
    */
   orderBy?: string;
   /**
-   * Select expression using OData notation. Limits the columns on each record to just those
-   * requested, e.g. "$select=PolicyAssignmentId, ResourceId".
+   * @member {string} [select] Select expression using OData notation. Limits
+   * the columns on each record to just those requested, e.g.
+   * "$select=PolicyAssignmentId, ResourceId".
    */
   select?: string;
   /**
-   * ISO 8601 formatted timestamp specifying the start time of the interval to query. When not
-   * specified, the service uses ($to - 1-day).
+   * @member {Date} [from] ISO 8601 formatted timestamp specifying the start
+   * time of the interval to query. When not specified, the service uses ($to -
+   * 1-day).
    */
   from?: Date;
   /**
-   * ISO 8601 formatted timestamp specifying the end time of the interval to query. When not
-   * specified, the service uses request time.
+   * @member {Date} [to] ISO 8601 formatted timestamp specifying the end time
+   * of the interval to query. When not specified, the service uses request
+   * time.
    */
   to?: Date;
   /**
-   * OData apply expression for aggregations.
+   * @member {string} [apply] OData apply expression for aggregations.
    */
   apply?: string;
   /**
-   * The $expand query parameter. For example, to expand policyEvaluationDetails, use
-   * $expand=policyEvaluationDetails
+   * @member {string} [expand] The $expand query parameter. For example, to
+   * expand policyEvaluationDetails, use $expand=policyEvaluationDetails
    */
   expand?: string;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyTrackedResourcesListQueryResultsForManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyTrackedResourcesListQueryResultsForManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyTrackedResourcesListQueryResultsForSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyTrackedResourcesListQueryResultsForSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyTrackedResourcesListQueryResultsForResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyTrackedResourcesListQueryResultsForResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyTrackedResourcesListQueryResultsForResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyTrackedResourcesListQueryResultsForResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListDeploymentsAtManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListDeploymentsAtManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListForManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListForManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListDeploymentsAtSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListDeploymentsAtSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListForSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListForSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListDeploymentsAtResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListDeploymentsAtResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListForResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListForResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListDeploymentsAtResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListDeploymentsAtResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing RemediationsListForResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface RemediationsListForResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForPolicySetDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForPolicySetDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForPolicyDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForPolicyDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForManagementGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForManagementGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForSubscriptionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForSubscriptionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForResourceGroupOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForResourceGroupOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForResourceOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForResourceOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForPolicySetDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForPolicySetDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForPolicySetDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForPolicySetDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForPolicyDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForPolicyDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForPolicyDefinitionOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForPolicyDefinitionOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForSubscriptionLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForSubscriptionLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
+ * An interface representing PolicyStatesSummarizeForResourceGroupLevelPolicyAssignmentOptionalParams.
  * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
  */
 export interface PolicyStatesSummarizeForResourceGroupLevelPolicyAssignmentOptionalParams extends msRest.RequestOptionsBase {
   /**
-   * Additional parameters for the operation
+   * @member {QueryOptions} [queryOptions] Additional parameters for the
+   * operation
    */
   queryOptions?: QueryOptions;
 }
 
 /**
+ * @interface
  * An interface representing PolicyInsightsClientOptions.
+ * @extends AzureServiceClientOptions
  */
 export interface PolicyInsightsClientOptions extends AzureServiceClientOptions {
+  /**
+   * @member {string} [baseUri]
+   */
   baseUri?: string;
 }
 
+
 /**
  * @interface
+ * An interface representing the PolicyTrackedResourcesQueryResults.
  * Query results.
+ *
  * @extends Array<PolicyTrackedResource>
  */
 export interface PolicyTrackedResourcesQueryResults extends Array<PolicyTrackedResource> {
   /**
-   * The URL to get the next set of results.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [nextLink] The URL to get the next set of results.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly nextLink?: string;
 }
 
 /**
  * @interface
+ * An interface representing the RemediationDeploymentsListResult.
  * List of deployments for a remediation.
+ *
  * @extends Array<RemediationDeployment>
  */
 export interface RemediationDeploymentsListResult extends Array<RemediationDeployment> {
   /**
-   * The URL to get the next set of results.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [nextLink] The URL to get the next set of results.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly nextLink?: string;
 }
 
 /**
  * @interface
+ * An interface representing the RemediationListResult.
  * List of remediations.
+ *
  * @extends Array<Remediation>
  */
 export interface RemediationListResult extends Array<Remediation> {
   /**
-   * The URL to get the next set of results.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   * @member {string} [nextLink] The URL to get the next set of results.
+   * **NOTE: This property will not be serialized. It can only be populated by
+   * the server.**
    */
   readonly nextLink?: string;
 }
 
+/**
+ * @interface
+ * An interface representing the PolicyEventsQueryResults.
+ * Query results.
+ *
+ * @extends Array<PolicyEvent>
+ */
+export interface PolicyEventsQueryResults extends Array<PolicyEvent> {
+  /**
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
+   */
+  odatacontext?: string;
+  /**
+   * @member {number} [odatacount] OData entity count; represents the number of
+   * policy event records returned.
+   */
+  odatacount?: number;
+  /**
+   * @member {string} [odatanextLink] Odata next link, used to get the next set
+   * of records.
+   */
+  odatanextLink?: string;
+}
+
+/**
+ * @interface
+ * An interface representing the PolicyStatesQueryResults.
+ * Query results.
+ *
+ * @extends Array<PolicyState>
+ */
+export interface PolicyStatesQueryResults extends Array<PolicyState> {
+  /**
+   * @member {string} [odatacontext] OData context string; used by OData
+   * clients to resolve type information based on metadata.
+   */
+  odatacontext?: string;
+  /**
+   * @member {number} [odatacount] OData entity count; represents the number of
+   * policy state records returned.
+   */
+  odatacount?: number;
+  /**
+   * @member {string} [odatanextLink] Odata next link, used to get the next set
+   * of records.
+   */
+  odatanextLink?: string;
+}
+
 /**
  * Defines values for PolicyStatesResource.
  * Possible values include: 'default', 'latest'
@@ -1279,7 +1692,6 @@ export type PolicyTrackedResourcesListQueryResultsForManagementGroupResponse = P
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1299,7 +1711,6 @@ export type PolicyTrackedResourcesListQueryResultsForSubscriptionResponse = Poli
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1319,7 +1730,6 @@ export type PolicyTrackedResourcesListQueryResultsForResourceGroupResponse = Pol
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1339,7 +1749,6 @@ export type PolicyTrackedResourcesListQueryResultsForResourceResponse = PolicyTr
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1359,7 +1768,6 @@ export type PolicyTrackedResourcesListQueryResultsForManagementGroupNextResponse
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1379,7 +1787,6 @@ export type PolicyTrackedResourcesListQueryResultsForSubscriptionNextResponse =
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1399,7 +1806,6 @@ export type PolicyTrackedResourcesListQueryResultsForResourceGroupNextResponse =
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1419,7 +1825,6 @@ export type PolicyTrackedResourcesListQueryResultsForResourceNextResponse = Poli
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1439,7 +1844,6 @@ export type RemediationsListDeploymentsAtManagementGroupResponse = RemediationDe
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1459,7 +1863,6 @@ export type RemediationsCancelAtManagementGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1479,7 +1882,6 @@ export type RemediationsListForManagementGroupResponse = RemediationListResult &
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1499,7 +1901,6 @@ export type RemediationsCreateOrUpdateAtManagementGroupResponse = Remediation &
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1519,7 +1920,6 @@ export type RemediationsGetAtManagementGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1539,7 +1939,6 @@ export type RemediationsDeleteAtManagementGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1559,7 +1958,6 @@ export type RemediationsListDeploymentsAtSubscriptionResponse = RemediationDeplo
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1579,7 +1977,6 @@ export type RemediationsCancelAtSubscriptionResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1599,7 +1996,6 @@ export type RemediationsListForSubscriptionResponse = RemediationListResult & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1619,7 +2015,6 @@ export type RemediationsCreateOrUpdateAtSubscriptionResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1639,7 +2034,6 @@ export type RemediationsGetAtSubscriptionResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1659,7 +2053,6 @@ export type RemediationsDeleteAtSubscriptionResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1679,7 +2072,6 @@ export type RemediationsListDeploymentsAtResourceGroupResponse = RemediationDepl
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1699,7 +2091,6 @@ export type RemediationsCancelAtResourceGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1719,7 +2110,6 @@ export type RemediationsListForResourceGroupResponse = RemediationListResult & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1739,7 +2129,6 @@ export type RemediationsCreateOrUpdateAtResourceGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1759,7 +2148,6 @@ export type RemediationsGetAtResourceGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1779,7 +2167,6 @@ export type RemediationsDeleteAtResourceGroupResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1799,7 +2186,6 @@ export type RemediationsListDeploymentsAtResourceResponse = RemediationDeploymen
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1819,7 +2205,6 @@ export type RemediationsCancelAtResourceResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1839,7 +2224,6 @@ export type RemediationsListForResourceResponse = RemediationListResult & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1859,7 +2243,6 @@ export type RemediationsCreateOrUpdateAtResourceResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1879,7 +2262,6 @@ export type RemediationsGetAtResourceResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1899,7 +2281,6 @@ export type RemediationsDeleteAtResourceResponse = Remediation & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1919,7 +2300,6 @@ export type RemediationsListDeploymentsAtManagementGroupNextResponse = Remediati
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1939,7 +2319,6 @@ export type RemediationsListForManagementGroupNextResponse = RemediationListResu
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1959,7 +2338,6 @@ export type RemediationsListDeploymentsAtSubscriptionNextResponse = RemediationD
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1979,7 +2357,6 @@ export type RemediationsListForSubscriptionNextResponse = RemediationListResult
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -1999,7 +2376,6 @@ export type RemediationsListDeploymentsAtResourceGroupNextResponse = Remediation
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2019,7 +2395,6 @@ export type RemediationsListForResourceGroupNextResponse = RemediationListResult
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2039,7 +2414,6 @@ export type RemediationsListDeploymentsAtResourceNextResponse = RemediationDeplo
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2059,7 +2433,6 @@ export type RemediationsListForResourceNextResponse = RemediationListResult & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2079,7 +2452,6 @@ export type PolicyEventsListQueryResultsForManagementGroupResponse = PolicyEvent
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2099,7 +2471,6 @@ export type PolicyEventsListQueryResultsForSubscriptionResponse = PolicyEventsQu
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2119,7 +2490,6 @@ export type PolicyEventsListQueryResultsForResourceGroupResponse = PolicyEventsQ
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2139,7 +2509,6 @@ export type PolicyEventsListQueryResultsForResourceResponse = PolicyEventsQueryR
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2159,7 +2528,6 @@ export type PolicyEventsListQueryResultsForPolicySetDefinitionResponse = PolicyE
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2179,7 +2547,6 @@ export type PolicyEventsListQueryResultsForPolicyDefinitionResponse = PolicyEven
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2199,7 +2566,6 @@ export type PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentResp
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2219,7 +2585,6 @@ export type PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentRes
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2235,7 +2600,6 @@ export type PolicyEventsGetMetadataResponse = {
    * The parsed response body.
    */
   body: string;
-
   /**
    * The underlying HTTP response.
    */
@@ -2244,7 +2608,6 @@ export type PolicyEventsGetMetadataResponse = {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2253,9 +2616,9 @@ export type PolicyEventsGetMetadataResponse = {
 };
 
 /**
- * Contains response data for the listQueryResultsForManagementGroup operation.
+ * Contains response data for the listQueryResultsForManagementGroupNext operation.
  */
-export type PolicyStatesListQueryResultsForManagementGroupResponse = PolicyStatesQueryResults & {
+export type PolicyEventsListQueryResultsForManagementGroupNextResponse = PolicyEventsQueryResults & {
   /**
    * The underlying HTTP response.
    */
@@ -2264,18 +2627,17 @@ export type PolicyStatesListQueryResultsForManagementGroupResponse = PolicyState
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: PolicyStatesQueryResults;
+      parsedBody: PolicyEventsQueryResults;
     };
 };
 
 /**
- * Contains response data for the summarizeForManagementGroup operation.
+ * Contains response data for the listQueryResultsForSubscriptionNext operation.
  */
-export type PolicyStatesSummarizeForManagementGroupResponse = SummarizeResults & {
+export type PolicyEventsListQueryResultsForSubscriptionNextResponse = PolicyEventsQueryResults & {
   /**
    * The underlying HTTP response.
    */
@@ -2284,18 +2646,17 @@ export type PolicyStatesSummarizeForManagementGroupResponse = SummarizeResults &
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: SummarizeResults;
+      parsedBody: PolicyEventsQueryResults;
     };
 };
 
 /**
- * Contains response data for the listQueryResultsForSubscription operation.
+ * Contains response data for the listQueryResultsForResourceGroupNext operation.
  */
-export type PolicyStatesListQueryResultsForSubscriptionResponse = PolicyStatesQueryResults & {
+export type PolicyEventsListQueryResultsForResourceGroupNextResponse = PolicyEventsQueryResults & {
   /**
    * The underlying HTTP response.
    */
@@ -2304,11 +2665,164 @@ export type PolicyStatesListQueryResultsForSubscriptionResponse = PolicyStatesQu
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: PolicyStatesQueryResults;
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForResourceNext operation.
+ */
+export type PolicyEventsListQueryResultsForResourceNextResponse = PolicyEventsQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForPolicySetDefinitionNext operation.
+ */
+export type PolicyEventsListQueryResultsForPolicySetDefinitionNextResponse = PolicyEventsQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForPolicyDefinitionNext operation.
+ */
+export type PolicyEventsListQueryResultsForPolicyDefinitionNextResponse = PolicyEventsQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForSubscriptionLevelPolicyAssignmentNext
+ * operation.
+ */
+export type PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse = PolicyEventsQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForResourceGroupLevelPolicyAssignmentNext
+ * operation.
+ */
+export type PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse = PolicyEventsQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyEventsQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForManagementGroup operation.
+ */
+export type PolicyStatesListQueryResultsForManagementGroupResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the summarizeForManagementGroup operation.
+ */
+export type PolicyStatesSummarizeForManagementGroupResponse = SummarizeResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: SummarizeResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForSubscription operation.
+ */
+export type PolicyStatesListQueryResultsForSubscriptionResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
     };
 };
 
@@ -2324,7 +2838,6 @@ export type PolicyStatesSummarizeForSubscriptionResponse = SummarizeResults & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2344,7 +2857,6 @@ export type PolicyStatesListQueryResultsForResourceGroupResponse = PolicyStatesQ
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2364,7 +2876,6 @@ export type PolicyStatesSummarizeForResourceGroupResponse = SummarizeResults & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2384,7 +2895,6 @@ export type PolicyStatesListQueryResultsForResourceResponse = PolicyStatesQueryR
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2404,7 +2914,6 @@ export type PolicyStatesSummarizeForResourceResponse = SummarizeResults & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2424,7 +2933,6 @@ export type PolicyStatesListQueryResultsForPolicySetDefinitionResponse = PolicyS
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2444,7 +2952,6 @@ export type PolicyStatesSummarizeForPolicySetDefinitionResponse = SummarizeResul
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2464,7 +2971,6 @@ export type PolicyStatesListQueryResultsForPolicyDefinitionResponse = PolicyStat
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2484,7 +2990,6 @@ export type PolicyStatesSummarizeForPolicyDefinitionResponse = SummarizeResults
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2504,7 +3009,6 @@ export type PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentResp
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2524,7 +3028,6 @@ export type PolicyStatesSummarizeForSubscriptionLevelPolicyAssignmentResponse =
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2544,7 +3047,6 @@ export type PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentRes
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2564,7 +3066,6 @@ export type PolicyStatesSummarizeForResourceGroupLevelPolicyAssignmentResponse =
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
@@ -2580,7 +3081,44 @@ export type PolicyStatesGetMetadataResponse = {
    * The parsed response body.
    */
   body: string;
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: string;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForSubscriptionNext operation.
+ */
+export type PolicyStatesListQueryResultsForSubscriptionNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
 
+/**
+ * Contains response data for the listQueryResultsForResourceGroupNext operation.
+ */
+export type PolicyStatesListQueryResultsForResourceGroupNextResponse = PolicyStatesQueryResults & {
   /**
    * The underlying HTTP response.
    */
@@ -2589,11 +3127,107 @@ export type PolicyStatesGetMetadataResponse = {
        * The response body as text (string format)
        */
       bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
 
+/**
+ * Contains response data for the listQueryResultsForResourceNext operation.
+ */
+export type PolicyStatesListQueryResultsForResourceNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: string;
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForPolicySetDefinitionNext operation.
+ */
+export type PolicyStatesListQueryResultsForPolicySetDefinitionNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForPolicyDefinitionNext operation.
+ */
+export type PolicyStatesListQueryResultsForPolicyDefinitionNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForSubscriptionLevelPolicyAssignmentNext
+ * operation.
+ */
+export type PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
+    };
+};
+
+/**
+ * Contains response data for the listQueryResultsForResourceGroupLevelPolicyAssignmentNext
+ * operation.
+ */
+export type PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse = PolicyStatesQueryResults & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: PolicyStatesQueryResults;
     };
 };
 
@@ -2609,7 +3243,6 @@ export type OperationsListResponse = OperationsListResults & {
        * The response body as text (string format)
        */
       bodyAsText: string;
-
       /**
        * The response body as parsed JSON or XML
        */
diff --git a/packages/@azure/arm-policyinsights/lib/models/mappers.ts b/packages/@azure/arm-policyinsights/lib/models/mappers.ts
index 8b5abd58a0c3..3eeb7581e5cf 100644
--- a/packages/@azure/arm-policyinsights/lib/models/mappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/mappers.ts
@@ -1,9 +1,11 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
@@ -659,48 +661,6 @@ export const PolicyEvent: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyEventsQueryResults: msRest.CompositeMapper = {
-  serializedName: "PolicyEventsQueryResults",
-  type: {
-    name: "Composite",
-    className: "PolicyEventsQueryResults",
-    modelProperties: {
-      odatacontext: {
-        serializedName: "@odata\\.context",
-        type: {
-          name: "String"
-        }
-      },
-      odatacount: {
-        serializedName: "@odata\\.count",
-        constraints: {
-          InclusiveMinimum: 0
-        },
-        type: {
-          name: "Number"
-        }
-      },
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "PolicyEvent",
-              additionalProperties: {
-                type: {
-                  name: "Object"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
 export const ExpressionEvaluationDetails: msRest.CompositeMapper = {
   serializedName: "ExpressionEvaluationDetails",
   type: {
@@ -988,48 +948,6 @@ export const PolicyState: msRest.CompositeMapper = {
   }
 };
 
-export const PolicyStatesQueryResults: msRest.CompositeMapper = {
-  serializedName: "PolicyStatesQueryResults",
-  type: {
-    name: "Composite",
-    className: "PolicyStatesQueryResults",
-    modelProperties: {
-      odatacontext: {
-        serializedName: "@odata\\.context",
-        type: {
-          name: "String"
-        }
-      },
-      odatacount: {
-        serializedName: "@odata\\.count",
-        constraints: {
-          InclusiveMinimum: 0
-        },
-        type: {
-          name: "Number"
-        }
-      },
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "PolicyState",
-              additionalProperties: {
-                type: {
-                  name: "Object"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
 export const SummaryResults: msRest.CompositeMapper = {
   serializedName: "SummaryResults",
   type: {
@@ -1445,3 +1363,99 @@ export const RemediationListResult: msRest.CompositeMapper = {
     }
   }
 };
+
+export const PolicyEventsQueryResults: msRest.CompositeMapper = {
+  serializedName: "PolicyEventsQueryResults",
+  type: {
+    name: "Composite",
+    className: "PolicyEventsQueryResults",
+    modelProperties: {
+      odatacontext: {
+        serializedName: "@odata\\.context",
+        type: {
+          name: "String"
+        }
+      },
+      odatacount: {
+        serializedName: "@odata\\.count",
+        constraints: {
+          InclusiveMinimum: 0
+        },
+        type: {
+          name: "Number"
+        }
+      },
+      value: {
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "PolicyEvent",
+              additionalProperties: {
+                type: {
+                  name: "Object"
+                }
+              }
+            }
+          }
+        }
+      },
+      odatanextLink: {
+        serializedName: "@odata\\.nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const PolicyStatesQueryResults: msRest.CompositeMapper = {
+  serializedName: "PolicyStatesQueryResults",
+  type: {
+    name: "Composite",
+    className: "PolicyStatesQueryResults",
+    modelProperties: {
+      odatacontext: {
+        serializedName: "@odata\\.context",
+        type: {
+          name: "String"
+        }
+      },
+      odatacount: {
+        serializedName: "@odata\\.count",
+        constraints: {
+          InclusiveMinimum: 0
+        },
+        type: {
+          name: "Number"
+        }
+      },
+      value: {
+        serializedName: "",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "PolicyState",
+              additionalProperties: {
+                type: {
+                  name: "Object"
+                }
+              }
+            }
+          }
+        }
+      },
+      odatanextLink: {
+        serializedName: "@odata\\.nextLink",
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
diff --git a/packages/@azure/arm-policyinsights/lib/models/operationsMappers.ts b/packages/@azure/arm-policyinsights/lib/models/operationsMappers.ts
index bb2ed8c329be..0ea27c83310d 100644
--- a/packages/@azure/arm-policyinsights/lib/models/operationsMappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/operationsMappers.ts
@@ -1,15 +1,18 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 export {
+  OperationsListResults,
   Operation,
   OperationDisplay,
-  OperationsListResults,
   QueryFailure,
   QueryFailureError
 } from "../models/mappers";
+
diff --git a/packages/@azure/arm-policyinsights/lib/models/parameters.ts b/packages/@azure/arm-policyinsights/lib/models/parameters.ts
index e2c1ff341a07..89ae4e15f86c 100644
--- a/packages/@azure/arm-policyinsights/lib/models/parameters.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/parameters.ts
@@ -20,25 +20,11 @@ export const acceptLanguage: msRest.OperationParameter = {
     }
   }
 };
-export const apiVersion0: msRest.OperationQueryParameter = {
+export const apiVersion: msRest.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
-    isConstant: true,
-    serializedName: "api-version",
-    defaultValue: '2018-07-01-preview',
-    type: {
-      name: "String"
-    }
-  }
-};
-export const apiVersion1: msRest.OperationQueryParameter = {
-  parameterPath: "apiVersion",
-  mapper: {
-    required: true,
-    isConstant: true,
     serializedName: "api-version",
-    defaultValue: '2018-04-04',
     type: {
       name: "String"
     }
diff --git a/packages/@azure/arm-policyinsights/lib/models/policyEventsMappers.ts b/packages/@azure/arm-policyinsights/lib/models/policyEventsMappers.ts
index 52e0196d1a79..8fab1b4dd17c 100644
--- a/packages/@azure/arm-policyinsights/lib/models/policyEventsMappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/policyEventsMappers.ts
@@ -1,14 +1,17 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 export {
-  PolicyEvent,
   PolicyEventsQueryResults,
+  PolicyEvent,
   QueryFailure,
   QueryFailureError
 } from "../models/mappers";
+
diff --git a/packages/@azure/arm-policyinsights/lib/models/policyStatesMappers.ts b/packages/@azure/arm-policyinsights/lib/models/policyStatesMappers.ts
index 270dc52d87db..05748795e695 100644
--- a/packages/@azure/arm-policyinsights/lib/models/policyStatesMappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/policyStatesMappers.ts
@@ -1,22 +1,25 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 export {
+  PolicyStatesQueryResults,
+  PolicyState,
+  PolicyEvaluationDetails,
   ExpressionEvaluationDetails,
   IfNotExistsEvaluationDetails,
-  PolicyAssignmentSummary,
-  PolicyDefinitionSummary,
-  PolicyEvaluationDetails,
-  PolicyState,
-  PolicyStatesQueryResults,
   QueryFailure,
   QueryFailureError,
   SummarizeResults,
   Summary,
-  SummaryResults
+  SummaryResults,
+  PolicyAssignmentSummary,
+  PolicyDefinitionSummary
 } from "../models/mappers";
+
diff --git a/packages/@azure/arm-policyinsights/lib/models/policyTrackedResourcesMappers.ts b/packages/@azure/arm-policyinsights/lib/models/policyTrackedResourcesMappers.ts
index b2dc2065bce1..7fdc719c8ea1 100644
--- a/packages/@azure/arm-policyinsights/lib/models/policyTrackedResourcesMappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/policyTrackedResourcesMappers.ts
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 export {
-  PolicyDetails,
-  PolicyTrackedResource,
   PolicyTrackedResourcesQueryResults,
+  PolicyTrackedResource,
+  PolicyDetails,
+  TrackedResourceModificationDetails,
   QueryFailure,
-  QueryFailureError,
-  TrackedResourceModificationDetails
+  QueryFailureError
 } from "../models/mappers";
+
diff --git a/packages/@azure/arm-policyinsights/lib/models/remediationsMappers.ts b/packages/@azure/arm-policyinsights/lib/models/remediationsMappers.ts
index 392d3a1ec022..3b73015e520b 100644
--- a/packages/@azure/arm-policyinsights/lib/models/remediationsMappers.ts
+++ b/packages/@azure/arm-policyinsights/lib/models/remediationsMappers.ts
@@ -1,20 +1,23 @@
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
  */
 
 export {
-  BaseResource,
+  RemediationDeploymentsListResult,
+  RemediationDeployment,
   ErrorDefinition,
+  TypedErrorInfo,
   ErrorResponse,
   Remediation,
-  RemediationDeployment,
-  RemediationDeploymentsListResult,
-  RemediationDeploymentSummary,
+  BaseResource,
   RemediationFilters,
-  RemediationListResult,
-  TypedErrorInfo
+  RemediationDeploymentSummary,
+  RemediationListResult
 } from "../models/mappers";
+
diff --git a/packages/@azure/arm-policyinsights/lib/operations/operations.ts b/packages/@azure/arm-policyinsights/lib/operations/operations.ts
index 2ab288682dd7..c3b552c19e81 100644
--- a/packages/@azure/arm-policyinsights/lib/operations/operations.ts
+++ b/packages/@azure/arm-policyinsights/lib/operations/operations.ts
@@ -57,7 +57,7 @@ const listOperationSpec: msRest.OperationSpec = {
   httpMethod: "GET",
   path: "providers/Microsoft.PolicyInsights/operations",
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/packages/@azure/arm-policyinsights/lib/operations/policyEvents.ts b/packages/@azure/arm-policyinsights/lib/operations/policyEvents.ts
index 0fd2537cc1e7..0de9550bfcce 100644
--- a/packages/@azure/arm-policyinsights/lib/operations/policyEvents.ts
+++ b/packages/@azure/arm-policyinsights/lib/operations/policyEvents.ts
@@ -306,6 +306,232 @@ export class PolicyEvents {
       getMetadataOperationSpec,
       callback) as Promise<Models.PolicyEventsGetMetadataResponse>;
   }
+
+  /**
+   * Queries policy events for the resources under the management group.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForManagementGroupNextResponse>
+   */
+  listQueryResultsForManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForManagementGroupNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForManagementGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForManagementGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForManagementGroupNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForManagementGroupNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForManagementGroupNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the resources under the subscription.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForSubscriptionNextResponse>
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForSubscriptionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForSubscriptionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForSubscriptionNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForSubscriptionNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the resources under the resource group.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForResourceGroupNextResponse>
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForResourceGroupNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForResourceGroupNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceGroupNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForResourceGroupNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the resource.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForResourceNextResponse>
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForResourceNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForResourceNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForResourceNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the subscription level policy set definition.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForPolicySetDefinitionNextResponse>
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForPolicySetDefinitionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForPolicySetDefinitionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForPolicySetDefinitionNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForPolicySetDefinitionNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the subscription level policy definition.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyEventsListQueryResultsForPolicyDefinitionNextResponse>
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForPolicyDefinitionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForPolicyDefinitionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForPolicyDefinitionNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForPolicyDefinitionNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the subscription level policy assignment.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns
+   * Promise<Models.PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForSubscriptionLevelPolicyAssignmentNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>;
+  }
+
+  /**
+   * Queries policy events for the resource group level policy assignment.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns
+   * Promise<Models.PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): void;
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyEventsQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyEventsQueryResults>): Promise<Models.PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceGroupLevelPolicyAssignmentNextOperationSpec,
+      callback) as Promise<Models.PolicyEventsListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>;
+  }
 }
 
 // Operation Specifications
@@ -319,7 +545,7 @@ const listQueryResultsForManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.managementGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -350,7 +576,7 @@ const listQueryResultsForSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -382,7 +608,7 @@ const listQueryResultsForResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.resourceGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -413,7 +639,7 @@ const listQueryResultsForResourceOperationSpec: msRest.OperationSpec = {
     Parameters.resourceId
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -446,7 +672,7 @@ const listQueryResultsForPolicySetDefinitionOperationSpec: msRest.OperationSpec
     Parameters.policySetDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -479,7 +705,7 @@ const listQueryResultsForPolicyDefinitionOperationSpec: msRest.OperationSpec = {
     Parameters.policyDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -512,7 +738,7 @@ const listQueryResultsForSubscriptionLevelPolicyAssignmentOperationSpec: msRest.
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -546,7 +772,7 @@ const listQueryResultsForResourceGroupLevelPolicyAssignmentOperationSpec: msRest
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion1,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -576,7 +802,7 @@ const getMetadataOperationSpec: msRest.OperationSpec = {
     Parameters.scope
   ],
   queryParameters: [
-    Parameters.apiVersion1
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -596,3 +822,171 @@ const getMetadataOperationSpec: msRest.OperationSpec = {
   },
   serializer
 };
+
+const listQueryResultsForManagementGroupNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForSubscriptionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceGroupNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForPolicySetDefinitionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForPolicyDefinitionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForSubscriptionLevelPolicyAssignmentNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceGroupLevelPolicyAssignmentNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyEventsQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
diff --git a/packages/@azure/arm-policyinsights/lib/operations/policyStates.ts b/packages/@azure/arm-policyinsights/lib/operations/policyStates.ts
index 41e66fd2afcd..8e384bb401c3 100644
--- a/packages/@azure/arm-policyinsights/lib/operations/policyStates.ts
+++ b/packages/@azure/arm-policyinsights/lib/operations/policyStates.ts
@@ -634,6 +634,204 @@ export class PolicyStates {
       getMetadataOperationSpec,
       callback) as Promise<Models.PolicyStatesGetMetadataResponse>;
   }
+
+  /**
+   * Queries policy states for the resources under the subscription.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyStatesListQueryResultsForSubscriptionNextResponse>
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForSubscriptionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForSubscriptionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForSubscriptionNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForSubscriptionNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the resources under the resource group.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyStatesListQueryResultsForResourceGroupNextResponse>
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForResourceGroupNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForResourceGroupNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceGroupNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForResourceGroupNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the resource.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyStatesListQueryResultsForResourceNextResponse>
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForResourceNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForResourceNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForResourceNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the subscription level policy set definition.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyStatesListQueryResultsForPolicySetDefinitionNextResponse>
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForPolicySetDefinitionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForPolicySetDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForPolicySetDefinitionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForPolicySetDefinitionNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForPolicySetDefinitionNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the subscription level policy definition.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns Promise<Models.PolicyStatesListQueryResultsForPolicyDefinitionNextResponse>
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForPolicyDefinitionNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForPolicyDefinitionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForPolicyDefinitionNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForPolicyDefinitionNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForPolicyDefinitionNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the subscription level policy assignment.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns
+   * Promise<Models.PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForSubscriptionLevelPolicyAssignmentNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForSubscriptionLevelPolicyAssignmentNextResponse>;
+  }
+
+  /**
+   * Queries policy states for the resource group level policy assignment.
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param [options] The optional parameters
+   * @returns
+   * Promise<Models.PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  /**
+   * @param nextPageLink The NextLink from the previous successful call to List operation.
+   * @param options The optional parameters
+   * @param callback The callback
+   */
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): void;
+  listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.PolicyStatesQueryResults>, callback?: msRest.ServiceCallback<Models.PolicyStatesQueryResults>): Promise<Models.PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse> {
+    return this.client.sendOperationRequest(
+      {
+        nextPageLink,
+        options
+      },
+      listQueryResultsForResourceGroupLevelPolicyAssignmentNextOperationSpec,
+      callback) as Promise<Models.PolicyStatesListQueryResultsForResourceGroupLevelPolicyAssignmentNextResponse>;
+  }
 }
 
 // Operation Specifications
@@ -647,7 +845,7 @@ const listQueryResultsForManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.managementGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -679,7 +877,7 @@ const summarizeForManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.managementGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -707,7 +905,7 @@ const listQueryResultsForSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -738,7 +936,7 @@ const summarizeForSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -767,7 +965,7 @@ const listQueryResultsForResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.resourceGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -799,7 +997,7 @@ const summarizeForResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.resourceGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -827,7 +1025,7 @@ const listQueryResultsForResourceOperationSpec: msRest.OperationSpec = {
     Parameters.resourceId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -859,7 +1057,7 @@ const summarizeForResourceOperationSpec: msRest.OperationSpec = {
     Parameters.resourceId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -889,7 +1087,7 @@ const listQueryResultsForPolicySetDefinitionOperationSpec: msRest.OperationSpec
     Parameters.policySetDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -922,7 +1120,7 @@ const summarizeForPolicySetDefinitionOperationSpec: msRest.OperationSpec = {
     Parameters.policySetDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -952,7 +1150,7 @@ const listQueryResultsForPolicyDefinitionOperationSpec: msRest.OperationSpec = {
     Parameters.policyDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -985,7 +1183,7 @@ const summarizeForPolicyDefinitionOperationSpec: msRest.OperationSpec = {
     Parameters.policyDefinitionName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -1015,7 +1213,7 @@ const listQueryResultsForSubscriptionLevelPolicyAssignmentOperationSpec: msRest.
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -1048,7 +1246,7 @@ const summarizeForSubscriptionLevelPolicyAssignmentOperationSpec: msRest.Operati
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -1079,7 +1277,7 @@ const listQueryResultsForResourceGroupLevelPolicyAssignmentOperationSpec: msRest
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.orderBy,
     Parameters.select,
@@ -1113,7 +1311,7 @@ const summarizeForResourceGroupLevelPolicyAssignmentOperationSpec: msRest.Operat
     Parameters.policyAssignmentName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.from,
     Parameters.to,
@@ -1140,7 +1338,7 @@ const getMetadataOperationSpec: msRest.OperationSpec = {
     Parameters.scope
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1160,3 +1358,150 @@ const getMetadataOperationSpec: msRest.OperationSpec = {
   },
   serializer
 };
+
+const listQueryResultsForSubscriptionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceGroupNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForPolicySetDefinitionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForPolicyDefinitionNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForSubscriptionLevelPolicyAssignmentNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
+
+const listQueryResultsForResourceGroupLevelPolicyAssignmentNextOperationSpec: msRest.OperationSpec = {
+  httpMethod: "POST",
+  baseUrl: "https://management.azure.com",
+  path: "{nextLink}",
+  urlParameters: [
+    Parameters.nextPageLink
+  ],
+  headerParameters: [
+    Parameters.acceptLanguage
+  ],
+  responses: {
+    200: {
+      bodyMapper: Mappers.PolicyStatesQueryResults
+    },
+    default: {
+      bodyMapper: Mappers.QueryFailure
+    }
+  },
+  serializer
+};
diff --git a/packages/@azure/arm-policyinsights/lib/operations/policyTrackedResources.ts b/packages/@azure/arm-policyinsights/lib/operations/policyTrackedResources.ts
index 76d76cddd053..6ee3530d4007 100644
--- a/packages/@azure/arm-policyinsights/lib/operations/policyTrackedResources.ts
+++ b/packages/@azure/arm-policyinsights/lib/operations/policyTrackedResources.ts
@@ -266,7 +266,7 @@ const listQueryResultsForManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.policyTrackedResourcesResource
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -292,7 +292,7 @@ const listQueryResultsForSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -319,7 +319,7 @@ const listQueryResultsForResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -345,7 +345,7 @@ const listQueryResultsForResourceOperationSpec: msRest.OperationSpec = {
     Parameters.policyTrackedResourcesResource
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
diff --git a/packages/@azure/arm-policyinsights/lib/operations/remediations.ts b/packages/@azure/arm-policyinsights/lib/operations/remediations.ts
index ae8d36d2b1aa..48a1fb1ff1a8 100644
--- a/packages/@azure/arm-policyinsights/lib/operations/remediations.ts
+++ b/packages/@azure/arm-policyinsights/lib/operations/remediations.ts
@@ -1054,7 +1054,7 @@ const listDeploymentsAtManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top
   ],
   headerParameters: [
@@ -1080,7 +1080,7 @@ const cancelAtManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1104,7 +1104,7 @@ const listForManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.managementGroupId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -1131,7 +1131,7 @@ const createOrUpdateAtManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1166,7 +1166,7 @@ const getAtManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1191,7 +1191,7 @@ const deleteAtManagementGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1216,7 +1216,7 @@ const listDeploymentsAtSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top
   ],
   headerParameters: [
@@ -1241,7 +1241,7 @@ const cancelAtSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1264,7 +1264,7 @@ const listForSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.subscriptionId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -1290,7 +1290,7 @@ const createOrUpdateAtSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1324,7 +1324,7 @@ const getAtSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1348,7 +1348,7 @@ const deleteAtSubscriptionOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1374,7 +1374,7 @@ const listDeploymentsAtResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top
   ],
   headerParameters: [
@@ -1400,7 +1400,7 @@ const cancelAtResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1424,7 +1424,7 @@ const listForResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.resourceGroupName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -1451,7 +1451,7 @@ const createOrUpdateAtResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1486,7 +1486,7 @@ const getAtResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1511,7 +1511,7 @@ const deleteAtResourceGroupOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1536,7 +1536,7 @@ const listDeploymentsAtResourceOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top
   ],
   headerParameters: [
@@ -1561,7 +1561,7 @@ const cancelAtResourceOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1584,7 +1584,7 @@ const listForResourceOperationSpec: msRest.OperationSpec = {
     Parameters.resourceId
   ],
   queryParameters: [
-    Parameters.apiVersion0,
+    Parameters.apiVersion,
     Parameters.top,
     Parameters.filter
   ],
@@ -1610,7 +1610,7 @@ const createOrUpdateAtResourceOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1644,7 +1644,7 @@ const getAtResourceOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
@@ -1668,7 +1668,7 @@ const deleteAtResourceOperationSpec: msRest.OperationSpec = {
     Parameters.remediationName
   ],
   queryParameters: [
-    Parameters.apiVersion0
+    Parameters.apiVersion
   ],
   headerParameters: [
     Parameters.acceptLanguage
diff --git a/packages/@azure/arm-policyinsights/lib/policyInsightsClientContext.ts b/packages/@azure/arm-policyinsights/lib/policyInsightsClientContext.ts
index 61d1d3ab5598..6453c4239d6e 100644
--- a/packages/@azure/arm-policyinsights/lib/policyInsightsClientContext.ts
+++ b/packages/@azure/arm-policyinsights/lib/policyInsightsClientContext.ts
@@ -13,10 +13,11 @@ import * as msRest from "@azure/ms-rest-js";
 import * as msRestAzure from "@azure/ms-rest-azure-js";
 
 const packageName = "@azure/arm-policyinsights";
-const packageVersion = "2.0.1";
+const packageVersion = "2.1.0";
 
 export class PolicyInsightsClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
+  apiVersion?: string;
 
   /**
    * Initializes a new instance of the PolicyInsightsClient class.
@@ -38,6 +39,7 @@ export class PolicyInsightsClientContext extends msRestAzure.AzureServiceClient
 
     super(credentials, options);
 
+    this.apiVersion = '2018-07-01-preview';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
diff --git a/packages/@azure/arm-policyinsights/package.json b/packages/@azure/arm-policyinsights/package.json
index c3d946bf4945..6169d6fa126a 100644
--- a/packages/@azure/arm-policyinsights/package.json
+++ b/packages/@azure/arm-policyinsights/package.json
@@ -4,8 +4,8 @@
   "description": "PolicyInsightsClient Library with typescript type definitions for node.js and browser.",
   "version": "2.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.3.2",
-    "@azure/ms-rest-js": "^1.6.0",
+    "@azure/ms-rest-azure-js": "^1.2.0",
+    "@azure/ms-rest-js": "^1.2.0",
     "tslib": "^1.9.3"
   },
   "keywords": [
@@ -44,7 +44,6 @@
     "esm/**/*.d.ts",
     "esm/**/*.d.ts.map",
     "lib/**/*.ts",
-    "README.md",
     "rollup.config.js",
     "tsconfig.json"
   ],
@@ -53,6 +52,5 @@
     "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-policyinsights.js.map'\" -o ./dist/arm-policyinsights.min.js ./dist/arm-policyinsights.js",
     "prepack": "npm install && npm run build"
   },
-  "sideEffects": false,
-  "autoPublish": true
+  "sideEffects": false
 }