diff --git a/sdk/policyinsights/mgmt-v2019_10_01/pom.xml b/sdk/policyinsights/mgmt-v2019_10_01/pom.xml
index 1b09c2954250..025cea421db0 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/pom.xml
+++ b/sdk/policyinsights/mgmt-v2019_10_01/pom.xml
@@ -12,7 +12,7 @@
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
         <version>1.1.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-policyinsights</artifactId>
     <version>1.0.0-beta</version>
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentEventDetails.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentEventDetails.java
new file mode 100644
index 000000000000..e6863e8515f0
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentEventDetails.java
@@ -0,0 +1,228 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01;
+
+import java.util.Map;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Component event details.
+ */
+public class ComponentEventDetails {
+    /**
+     * Unmatched properties from the message are deserialized this collection.
+     */
+    @JsonProperty(value = "")
+    private Map<String, Object> additionalProperties;
+
+    /**
+     * Component Id.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Component type.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Component name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Timestamp for component policy event record.
+     */
+    @JsonProperty(value = "timestamp")
+    private DateTime timestamp;
+
+    /**
+     * Tenant ID for the policy event record.
+     */
+    @JsonProperty(value = "tenantId")
+    private String tenantId;
+
+    /**
+     * Principal object ID for the user who initiated the resource component
+     * operation that triggered the policy event.
+     */
+    @JsonProperty(value = "principalOid")
+    private String principalOid;
+
+    /**
+     * Policy definition action, i.e. effect.
+     */
+    @JsonProperty(value = "policyDefinitionAction")
+    private String policyDefinitionAction;
+
+    /**
+     * Get unmatched properties from the message are deserialized this collection.
+     *
+     * @return the additionalProperties value
+     */
+    public Map<String, Object> additionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /**
+     * Set unmatched properties from the message are deserialized this collection.
+     *
+     * @param additionalProperties the additionalProperties value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+        return this;
+    }
+
+    /**
+     * Get component Id.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set component Id.
+     *
+     * @param id the id value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get component type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set component type.
+     *
+     * @param type the type value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get component name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set component name.
+     *
+     * @param name the name value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get timestamp for component policy event record.
+     *
+     * @return the timestamp value
+     */
+    public DateTime timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Set timestamp for component policy event record.
+     *
+     * @param timestamp the timestamp value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withTimestamp(DateTime timestamp) {
+        this.timestamp = timestamp;
+        return this;
+    }
+
+    /**
+     * Get tenant ID for the policy event record.
+     *
+     * @return the tenantId value
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Set tenant ID for the policy event record.
+     *
+     * @param tenantId the tenantId value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    /**
+     * Get principal object ID for the user who initiated the resource component operation that triggered the policy event.
+     *
+     * @return the principalOid value
+     */
+    public String principalOid() {
+        return this.principalOid;
+    }
+
+    /**
+     * Set principal object ID for the user who initiated the resource component operation that triggered the policy event.
+     *
+     * @param principalOid the principalOid value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withPrincipalOid(String principalOid) {
+        this.principalOid = principalOid;
+        return this;
+    }
+
+    /**
+     * Get policy definition action, i.e. effect.
+     *
+     * @return the policyDefinitionAction value
+     */
+    public String policyDefinitionAction() {
+        return this.policyDefinitionAction;
+    }
+
+    /**
+     * Set policy definition action, i.e. effect.
+     *
+     * @param policyDefinitionAction the policyDefinitionAction value to set
+     * @return the ComponentEventDetails object itself.
+     */
+    public ComponentEventDetails withPolicyDefinitionAction(String policyDefinitionAction) {
+        this.policyDefinitionAction = policyDefinitionAction;
+        return this;
+    }
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentStateDetails.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentStateDetails.java
new file mode 100644
index 000000000000..c85a7ea16103
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/ComponentStateDetails.java
@@ -0,0 +1,175 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01;
+
+import java.util.Map;
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Component state details.
+ */
+public class ComponentStateDetails {
+    /**
+     * Unmatched properties from the message are deserialized this collection.
+     */
+    @JsonProperty(value = "")
+    private Map<String, Object> additionalProperties;
+
+    /**
+     * Component Id.
+     */
+    @JsonProperty(value = "id")
+    private String id;
+
+    /**
+     * Component type.
+     */
+    @JsonProperty(value = "type")
+    private String type;
+
+    /**
+     * Component name.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Component compliance evaluation timestamp.
+     */
+    @JsonProperty(value = "timestamp")
+    private DateTime timestamp;
+
+    /**
+     * Component compliance state.
+     */
+    @JsonProperty(value = "complianceState")
+    private String complianceState;
+
+    /**
+     * Get unmatched properties from the message are deserialized this collection.
+     *
+     * @return the additionalProperties value
+     */
+    public Map<String, Object> additionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /**
+     * Set unmatched properties from the message are deserialized this collection.
+     *
+     * @param additionalProperties the additionalProperties value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+        return this;
+    }
+
+    /**
+     * Get component Id.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set component Id.
+     *
+     * @param id the id value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get component type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Set component type.
+     *
+     * @param type the type value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get component name.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set component name.
+     *
+     * @param name the name value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get component compliance evaluation timestamp.
+     *
+     * @return the timestamp value
+     */
+    public DateTime timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Set component compliance evaluation timestamp.
+     *
+     * @param timestamp the timestamp value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withTimestamp(DateTime timestamp) {
+        this.timestamp = timestamp;
+        return this;
+    }
+
+    /**
+     * Get component compliance state.
+     *
+     * @return the complianceState value
+     */
+    public String complianceState() {
+        return this.complianceState;
+    }
+
+    /**
+     * Set component compliance state.
+     *
+     * @param complianceState the complianceState value to set
+     * @return the ComponentStateDetails object itself.
+     */
+    public ComponentStateDetails withComplianceState(String complianceState) {
+        this.complianceState = complianceState;
+        return this;
+    }
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvent.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvent.java
new file mode 100644
index 000000000000..87049467a64a
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvent.java
@@ -0,0 +1,183 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.implementation.PolicyInsightsManager;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.implementation.PolicyEventInner;
+import java.util.Map;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing PolicyEvent.
+ */
+public interface PolicyEvent extends HasInner<PolicyEventInner>, HasManager<PolicyInsightsManager> {
+    /**
+     * @return the additionalProperties value.
+     */
+    Map<String, Object> additionalProperties();
+
+    /**
+     * @return the complianceState value.
+     */
+    String complianceState();
+
+    /**
+     * @return the components value.
+     */
+    List<ComponentEventDetails> components();
+
+    /**
+     * @return the effectiveParameters value.
+     */
+    String effectiveParameters();
+
+    /**
+     * @return the isCompliant value.
+     */
+    Boolean isCompliant();
+
+    /**
+     * @return the managementGroupIds value.
+     */
+    String managementGroupIds();
+
+    /**
+     * @return the odatacontext value.
+     */
+    String odatacontext();
+
+    /**
+     * @return the odataid value.
+     */
+    String odataid();
+
+    /**
+     * @return the policyAssignmentId value.
+     */
+    String policyAssignmentId();
+
+    /**
+     * @return the policyAssignmentName value.
+     */
+    String policyAssignmentName();
+
+    /**
+     * @return the policyAssignmentOwner value.
+     */
+    String policyAssignmentOwner();
+
+    /**
+     * @return the policyAssignmentParameters value.
+     */
+    String policyAssignmentParameters();
+
+    /**
+     * @return the policyAssignmentScope value.
+     */
+    String policyAssignmentScope();
+
+    /**
+     * @return the policyDefinitionAction value.
+     */
+    String policyDefinitionAction();
+
+    /**
+     * @return the policyDefinitionCategory value.
+     */
+    String policyDefinitionCategory();
+
+    /**
+     * @return the policyDefinitionId value.
+     */
+    String policyDefinitionId();
+
+    /**
+     * @return the policyDefinitionName value.
+     */
+    String policyDefinitionName();
+
+    /**
+     * @return the policyDefinitionReferenceId value.
+     */
+    String policyDefinitionReferenceId();
+
+    /**
+     * @return the policySetDefinitionCategory value.
+     */
+    String policySetDefinitionCategory();
+
+    /**
+     * @return the policySetDefinitionId value.
+     */
+    String policySetDefinitionId();
+
+    /**
+     * @return the policySetDefinitionName value.
+     */
+    String policySetDefinitionName();
+
+    /**
+     * @return the policySetDefinitionOwner value.
+     */
+    String policySetDefinitionOwner();
+
+    /**
+     * @return the policySetDefinitionParameters value.
+     */
+    String policySetDefinitionParameters();
+
+    /**
+     * @return the principalOid value.
+     */
+    String principalOid();
+
+    /**
+     * @return the resourceGroup value.
+     */
+    String resourceGroup();
+
+    /**
+     * @return the resourceId value.
+     */
+    String resourceId();
+
+    /**
+     * @return the resourceLocation value.
+     */
+    String resourceLocation();
+
+    /**
+     * @return the resourceTags value.
+     */
+    String resourceTags();
+
+    /**
+     * @return the resourceType value.
+     */
+    String resourceType();
+
+    /**
+     * @return the subscriptionId value.
+     */
+    String subscriptionId();
+
+    /**
+     * @return the tenantId value.
+     */
+    String tenantId();
+
+    /**
+     * @return the timestamp value.
+     */
+    DateTime timestamp();
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvents.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvents.java
index 1d788d1cddad..2198ba63a4bc 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvents.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyEvents.java
@@ -21,7 +21,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForManagementGroupAsync(String managementGroupName);
+    Observable<PolicyEvent> listQueryResultsForManagementGroupAsync(final String managementGroupName);
 
     /**
      * Queries policy events for the resources under the subscription.
@@ -30,7 +30,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForSubscriptionAsync(String subscriptionId);
+    Observable<PolicyEvent> listQueryResultsForSubscriptionAsync(final String subscriptionId);
 
     /**
      * Queries policy events for the resources under the resource group.
@@ -40,7 +40,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName);
+    Observable<PolicyEvent> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName);
 
     /**
      * Queries policy events for the resource.
@@ -49,7 +49,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForResourceAsync(String resourceId);
+    Observable<PolicyEvent> listQueryResultsForResourceAsync(final String resourceId);
 
     /**
      * Queries policy events for the subscription level policy set definition.
@@ -59,7 +59,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName);
+    Observable<PolicyEvent> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName);
 
     /**
      * Queries policy events for the subscription level policy definition.
@@ -69,7 +69,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName);
+    Observable<PolicyEvent> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName);
 
     /**
      * Queries policy events for the subscription level policy assignment.
@@ -79,7 +79,7 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName);
+    Observable<PolicyEvent> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName);
 
     /**
      * Queries policy events for the resource group level policy assignment.
@@ -90,15 +90,6 @@ public interface PolicyEvents {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyEventsQueryResults> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName);
-
-    /**
-     * Gets OData metadata XML document.
-     *
-     * @param scope A valid scope, i.e. management group, subscription, resource group, or resource ID. Scope used has no effect on metadata returned.
-     * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable for the request
-     */
-    Observable<String> getMetadataAsync(String scope);
+    Observable<PolicyEvent> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName);
 
 }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyState.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyState.java
new file mode 100644
index 000000000000..0f50580abc7f
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyState.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.implementation.PolicyInsightsManager;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.implementation.PolicyStateInner;
+import java.util.Map;
+import java.util.List;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing PolicyState.
+ */
+public interface PolicyState extends HasInner<PolicyStateInner>, HasManager<PolicyInsightsManager> {
+    /**
+     * @return the additionalProperties value.
+     */
+    Map<String, Object> additionalProperties();
+
+    /**
+     * @return the complianceState value.
+     */
+    String complianceState();
+
+    /**
+     * @return the components value.
+     */
+    List<ComponentStateDetails> components();
+
+    /**
+     * @return the effectiveParameters value.
+     */
+    String effectiveParameters();
+
+    /**
+     * @return the isCompliant value.
+     */
+    Boolean isCompliant();
+
+    /**
+     * @return the managementGroupIds value.
+     */
+    String managementGroupIds();
+
+    /**
+     * @return the odatacontext value.
+     */
+    String odatacontext();
+
+    /**
+     * @return the odataid value.
+     */
+    String odataid();
+
+    /**
+     * @return the policyAssignmentId value.
+     */
+    String policyAssignmentId();
+
+    /**
+     * @return the policyAssignmentName value.
+     */
+    String policyAssignmentName();
+
+    /**
+     * @return the policyAssignmentOwner value.
+     */
+    String policyAssignmentOwner();
+
+    /**
+     * @return the policyAssignmentParameters value.
+     */
+    String policyAssignmentParameters();
+
+    /**
+     * @return the policyAssignmentScope value.
+     */
+    String policyAssignmentScope();
+
+    /**
+     * @return the policyAssignmentVersion value.
+     */
+    String policyAssignmentVersion();
+
+    /**
+     * @return the policyDefinitionAction value.
+     */
+    String policyDefinitionAction();
+
+    /**
+     * @return the policyDefinitionCategory value.
+     */
+    String policyDefinitionCategory();
+
+    /**
+     * @return the policyDefinitionGroupNames value.
+     */
+    List<String> policyDefinitionGroupNames();
+
+    /**
+     * @return the policyDefinitionId value.
+     */
+    String policyDefinitionId();
+
+    /**
+     * @return the policyDefinitionName value.
+     */
+    String policyDefinitionName();
+
+    /**
+     * @return the policyDefinitionReferenceId value.
+     */
+    String policyDefinitionReferenceId();
+
+    /**
+     * @return the policyDefinitionVersion value.
+     */
+    String policyDefinitionVersion();
+
+    /**
+     * @return the policyEvaluationDetails value.
+     */
+    PolicyEvaluationDetails policyEvaluationDetails();
+
+    /**
+     * @return the policySetDefinitionCategory value.
+     */
+    String policySetDefinitionCategory();
+
+    /**
+     * @return the policySetDefinitionId value.
+     */
+    String policySetDefinitionId();
+
+    /**
+     * @return the policySetDefinitionName value.
+     */
+    String policySetDefinitionName();
+
+    /**
+     * @return the policySetDefinitionOwner value.
+     */
+    String policySetDefinitionOwner();
+
+    /**
+     * @return the policySetDefinitionParameters value.
+     */
+    String policySetDefinitionParameters();
+
+    /**
+     * @return the policySetDefinitionVersion value.
+     */
+    String policySetDefinitionVersion();
+
+    /**
+     * @return the resourceGroup value.
+     */
+    String resourceGroup();
+
+    /**
+     * @return the resourceId value.
+     */
+    String resourceId();
+
+    /**
+     * @return the resourceLocation value.
+     */
+    String resourceLocation();
+
+    /**
+     * @return the resourceTags value.
+     */
+    String resourceTags();
+
+    /**
+     * @return the resourceType value.
+     */
+    String resourceType();
+
+    /**
+     * @return the subscriptionId value.
+     */
+    String subscriptionId();
+
+    /**
+     * @return the timestamp value.
+     */
+    DateTime timestamp();
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyStates.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyStates.java
index 91c835ae3b6f..916ddac40338 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyStates.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/PolicyStates.java
@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.management.policyinsights.v2019_10_01;
 
+import rx.Completable;
 import rx.Observable;
 
 /**
@@ -22,7 +23,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName);
+    Observable<PolicyState> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName);
 
     /**
      * Summarizes policy states for the resources under the management group.
@@ -41,7 +42,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId);
+    Observable<PolicyState> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId);
 
     /**
      * Summarizes policy states for the resources under the subscription.
@@ -61,7 +62,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName);
+    Observable<PolicyState> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName);
 
     /**
      * Summarizes policy states for the resources under the resource group.
@@ -81,7 +82,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId);
+    Observable<PolicyState> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId);
 
     /**
      * Summarizes policy states for the resource.
@@ -92,6 +93,25 @@ public interface PolicyStates {
      */
     Observable<SummarizeResults> summarizeForResourceAsync(String resourceId);
 
+    /**
+     * Triggers a policy evaluation scan for all the resources under the subscription.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable triggerSubscriptionEvaluationAsync(String subscriptionId);
+
+    /**
+     * Triggers a policy evaluation scan for all the resources under the resource group.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Completable triggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName);
+
     /**
      * Queries policy states for the subscription level policy set definition.
      *
@@ -101,7 +121,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName);
+    Observable<PolicyState> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName);
 
     /**
      * Summarizes policy states for the subscription level policy set definition.
@@ -122,7 +142,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName);
+    Observable<PolicyState> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName);
 
     /**
      * Summarizes policy states for the subscription level policy definition.
@@ -143,7 +163,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName);
+    Observable<PolicyState> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName);
 
     /**
      * Summarizes policy states for the subscription level policy assignment.
@@ -165,7 +185,7 @@ public interface PolicyStates {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<PolicyStatesQueryResults> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName);
+    Observable<PolicyState> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName);
 
     /**
      * Summarizes policy states for the resource group level policy assignment.
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/QueryOptions.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/QueryOptions.java
index 5289127854c7..caeccbd74410 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/QueryOptions.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/QueryOptions.java
@@ -64,8 +64,15 @@ public class QueryOptions {
     private String apply;
 
     /**
-     * The $expand query parameter. For example, to expand
-     * policyEvaluationDetails, use $expand=policyEvaluationDetails.
+     * Skiptoken is only provided if a previous response returned a partial
+     * result as a part of nextLink element.
+     */
+    @JsonProperty(value = "")
+    private String skipToken;
+
+    /**
+     * The $expand query parameter. For example, to expand components use
+     * $expand=components.
      */
     @JsonProperty(value = "")
     private String expand;
@@ -211,7 +218,27 @@ public QueryOptions withApply(String apply) {
     }
 
     /**
-     * Get the $expand query parameter. For example, to expand policyEvaluationDetails, use $expand=policyEvaluationDetails.
+     * Get skiptoken is only provided if a previous response returned a partial result as a part of nextLink element.
+     *
+     * @return the skipToken value
+     */
+    public String skipToken() {
+        return this.skipToken;
+    }
+
+    /**
+     * Set skiptoken is only provided if a previous response returned a partial result as a part of nextLink element.
+     *
+     * @param skipToken the skipToken value to set
+     * @return the QueryOptions object itself.
+     */
+    public QueryOptions withSkipToken(String skipToken) {
+        this.skipToken = skipToken;
+        return this;
+    }
+
+    /**
+     * Get the $expand query parameter. For example, to expand components use $expand=components.
      *
      * @return the expand value
      */
@@ -220,7 +247,7 @@ public String expand() {
     }
 
     /**
-     * Set the $expand query parameter. For example, to expand policyEvaluationDetails, use $expand=policyEvaluationDetails.
+     * Set the $expand query parameter. For example, to expand components use $expand=components.
      *
      * @param expand the expand value to set
      * @return the QueryOptions object itself.
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/Remediation.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/Remediation.java
index 2cb39df9700f..11e7d513d28f 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/Remediation.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/Remediation.java
@@ -80,7 +80,7 @@ public interface Remediation extends HasInner<RemediationInner>, Indexable, Upda
     /**
      * The entirety of the Remediation definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagementGroupId, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithMicrosoft.PolicyInsight, DefinitionStages.WithCreate {
     }
 
     /**
@@ -90,19 +90,19 @@ interface DefinitionStages {
         /**
          * The first stage of a Remediation definition.
          */
-        interface Blank extends WithManagementGroupId {
+        interface Blank extends WithMicrosoft.PolicyInsight {
         }
 
         /**
-         * The stage of the remediation definition allowing to specify ManagementGroupId.
+         * The stage of the remediation definition allowing to specify Microsoft.PolicyInsight.
          */
-        interface WithManagementGroupId {
+        interface WithMicrosoft.PolicyInsight {
            /**
             * Specifies managementGroupId.
             * @param managementGroupId Management group ID
             * @return the next definition stage
             */
-            WithCreate withExistingManagementGroupId(String managementGroupId);
+            WithCreate withExistingMicrosoft.PolicyInsight(String managementGroupId);
         }
 
         /**
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PageImpl1.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PageImpl1.java
new file mode 100644
index 000000000000..deeaea3a0776
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PageImpl1.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01.implementation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.Page;
+import java.util.List;
+
+/**
+ * An instance of this class defines a page of Azure resources and a link to
+ * get the next page of resources, if any.
+ *
+ * @param <T> type of Azure resource
+ */
+public class PageImpl1<T> implements Page<T> {
+    /**
+     * The link to the next page.
+     */
+    @JsonProperty("@odata.nextLink")
+    private String nextPageLink;
+
+    /**
+     * The list of items.
+     */
+    @JsonProperty("value")
+    private List<T> items;
+
+    /**
+     * Gets the link to the next page.
+     *
+     * @return the link to the next page.
+     */
+    @Override
+    public String nextPageLink() {
+        return this.nextPageLink;
+    }
+
+    /**
+     * Gets the list of items.
+     *
+     * @return the list of items in {@link List}.
+     */
+    @Override
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Sets the link to the next page.
+     *
+     * @param nextPageLink the link to the next page.
+     * @return this Page object itself.
+     */
+    public PageImpl1<T> setNextPageLink(String nextPageLink) {
+        this.nextPageLink = nextPageLink;
+        return this;
+    }
+
+    /**
+     * Sets the list of items.
+     *
+     * @param items the list of items in {@link List}.
+     * @return this Page object itself.
+     */
+    public PageImpl1<T> setItems(List<T> items) {
+        this.items = items;
+        return this;
+    }
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventImpl.java
new file mode 100644
index 000000000000..4a6770fe0b1b
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventImpl.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01.implementation;
+
+import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvent;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+import java.util.List;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.ComponentEventDetails;
+import org.joda.time.DateTime;
+
+class PolicyEventImpl extends WrapperImpl<PolicyEventInner> implements PolicyEvent {
+    private final PolicyInsightsManager manager;
+    PolicyEventImpl(PolicyEventInner inner, PolicyInsightsManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public PolicyInsightsManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Map<String, Object> additionalProperties() {
+        return this.inner().additionalProperties();
+    }
+
+    @Override
+    public String complianceState() {
+        return this.inner().complianceState();
+    }
+
+    @Override
+    public List<ComponentEventDetails> components() {
+        return this.inner().components();
+    }
+
+    @Override
+    public String effectiveParameters() {
+        return this.inner().effectiveParameters();
+    }
+
+    @Override
+    public Boolean isCompliant() {
+        return this.inner().isCompliant();
+    }
+
+    @Override
+    public String managementGroupIds() {
+        return this.inner().managementGroupIds();
+    }
+
+    @Override
+    public String odatacontext() {
+        return this.inner().odatacontext();
+    }
+
+    @Override
+    public String odataid() {
+        return this.inner().odataid();
+    }
+
+    @Override
+    public String policyAssignmentId() {
+        return this.inner().policyAssignmentId();
+    }
+
+    @Override
+    public String policyAssignmentName() {
+        return this.inner().policyAssignmentName();
+    }
+
+    @Override
+    public String policyAssignmentOwner() {
+        return this.inner().policyAssignmentOwner();
+    }
+
+    @Override
+    public String policyAssignmentParameters() {
+        return this.inner().policyAssignmentParameters();
+    }
+
+    @Override
+    public String policyAssignmentScope() {
+        return this.inner().policyAssignmentScope();
+    }
+
+    @Override
+    public String policyDefinitionAction() {
+        return this.inner().policyDefinitionAction();
+    }
+
+    @Override
+    public String policyDefinitionCategory() {
+        return this.inner().policyDefinitionCategory();
+    }
+
+    @Override
+    public String policyDefinitionId() {
+        return this.inner().policyDefinitionId();
+    }
+
+    @Override
+    public String policyDefinitionName() {
+        return this.inner().policyDefinitionName();
+    }
+
+    @Override
+    public String policyDefinitionReferenceId() {
+        return this.inner().policyDefinitionReferenceId();
+    }
+
+    @Override
+    public String policySetDefinitionCategory() {
+        return this.inner().policySetDefinitionCategory();
+    }
+
+    @Override
+    public String policySetDefinitionId() {
+        return this.inner().policySetDefinitionId();
+    }
+
+    @Override
+    public String policySetDefinitionName() {
+        return this.inner().policySetDefinitionName();
+    }
+
+    @Override
+    public String policySetDefinitionOwner() {
+        return this.inner().policySetDefinitionOwner();
+    }
+
+    @Override
+    public String policySetDefinitionParameters() {
+        return this.inner().policySetDefinitionParameters();
+    }
+
+    @Override
+    public String principalOid() {
+        return this.inner().principalOid();
+    }
+
+    @Override
+    public String resourceGroup() {
+        return this.inner().resourceGroup();
+    }
+
+    @Override
+    public String resourceId() {
+        return this.inner().resourceId();
+    }
+
+    @Override
+    public String resourceLocation() {
+        return this.inner().resourceLocation();
+    }
+
+    @Override
+    public String resourceTags() {
+        return this.inner().resourceTags();
+    }
+
+    @Override
+    public String resourceType() {
+        return this.inner().resourceType();
+    }
+
+    @Override
+    public String subscriptionId() {
+        return this.inner().subscriptionId();
+    }
+
+    @Override
+    public String tenantId() {
+        return this.inner().tenantId();
+    }
+
+    @Override
+    public DateTime timestamp() {
+        return this.inner().timestamp();
+    }
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventInner.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventInner.java
index 52e79bbcadc6..f49e178d597a 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventInner.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventInner.java
@@ -10,6 +10,8 @@
 
 import java.util.Map;
 import org.joda.time.DateTime;
+import java.util.List;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.ComponentEventDetails;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -193,6 +195,12 @@ public class PolicyEventInner {
     @JsonProperty(value = "policyDefinitionReferenceId")
     private String policyDefinitionReferenceId;
 
+    /**
+     * Compliance state of the resource.
+     */
+    @JsonProperty(value = "complianceState")
+    private String complianceState;
+
     /**
      * Tenant ID for the policy event record.
      */
@@ -206,6 +214,13 @@ public class PolicyEventInner {
     @JsonProperty(value = "principalOid")
     private String principalOid;
 
+    /**
+     * Components events records populated only when URL contains
+     * $expand=components clause.
+     */
+    @JsonProperty(value = "components")
+    private List<ComponentEventDetails> components;
+
     /**
      * Get unmatched properties from the message are deserialized this collection.
      *
@@ -766,6 +781,26 @@ public PolicyEventInner withPolicyDefinitionReferenceId(String policyDefinitionR
         return this;
     }
 
+    /**
+     * Get compliance state of the resource.
+     *
+     * @return the complianceState value
+     */
+    public String complianceState() {
+        return this.complianceState;
+    }
+
+    /**
+     * Set compliance state of the resource.
+     *
+     * @param complianceState the complianceState value to set
+     * @return the PolicyEventInner object itself.
+     */
+    public PolicyEventInner withComplianceState(String complianceState) {
+        this.complianceState = complianceState;
+        return this;
+    }
+
     /**
      * Get tenant ID for the policy event record.
      *
@@ -806,4 +841,24 @@ public PolicyEventInner withPrincipalOid(String principalOid) {
         return this;
     }
 
+    /**
+     * Get components events records populated only when URL contains $expand=components clause.
+     *
+     * @return the components value
+     */
+    public List<ComponentEventDetails> components() {
+        return this.components;
+    }
+
+    /**
+     * Set components events records populated only when URL contains $expand=components clause.
+     *
+     * @param components the components value to set
+     * @return the PolicyEventInner object itself.
+     */
+    public PolicyEventInner withComponents(List<ComponentEventDetails> components) {
+        this.components = components;
+        return this;
+    }
+
 }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsImpl.java
index 9ec4f34bd53c..f535baecfffd 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsImpl.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsImpl.java
@@ -13,7 +13,8 @@
 import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents;
 import rx.functions.Func1;
 import rx.Observable;
-import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEventsQueryResults;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvent;
 
 class PolicyEventsImpl extends WrapperImpl<PolicyEventsInner> implements PolicyEvents {
     private final PolicyInsightsManager manager;
@@ -28,105 +29,147 @@ public PolicyInsightsManager manager() {
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForManagementGroupAsync(String managementGroupName) {
+    public Observable<PolicyEvent> listQueryResultsForManagementGroupAsync(final String managementGroupName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForManagementGroupAsync(managementGroupName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
+            @Override
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForSubscriptionAsync(String subscriptionId) {
+    public Observable<PolicyEvent> listQueryResultsForSubscriptionAsync(final String subscriptionId) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForSubscriptionAsync(subscriptionId)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
+            @Override
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName) {
+    public Observable<PolicyEvent> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForResourceGroupAsync(subscriptionId, resourceGroupName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
+            @Override
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForResourceAsync(String resourceId) {
+    public Observable<PolicyEvent> listQueryResultsForResourceAsync(final String resourceId) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForResourceAsync(resourceId)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
+            @Override
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName) {
+    public Observable<PolicyEvent> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForPolicySetDefinitionAsync(subscriptionId, policySetDefinitionName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
+            @Override
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName) {
+    public Observable<PolicyEvent> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForPolicyDefinitionAsync(subscriptionId, policyDefinitionName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
+            @Override
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName) {
+    public Observable<PolicyEvent> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(subscriptionId, policyAssignmentName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
+            @Override
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
     @Override
-    public Observable<PolicyEventsQueryResults> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+    public Observable<PolicyEvent> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
         PolicyEventsInner client = this.inner();
         return client.listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(subscriptionId, resourceGroupName, policyAssignmentName)
-        .map(new Func1<PolicyEventsQueryResultsInner, PolicyEventsQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyEventInner>, Iterable<PolicyEventInner>>() {
             @Override
-            public PolicyEventsQueryResults call(PolicyEventsQueryResultsInner inner) {
-                return new PolicyEventsQueryResultsImpl(inner, manager());
+            public Iterable<PolicyEventInner> call(Page<PolicyEventInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyEventInner, PolicyEvent>() {
+            @Override
+            public PolicyEvent call(PolicyEventInner inner) {
+                return new PolicyEventImpl(inner, manager());
             }
         });
     }
 
-    @Override
-    public Observable<String> getMetadataAsync(String scope) {
-        PolicyEventsInner client = this.inner();
-        return client.getMetadataAsync(scope)
-    ;}
-
 }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsInner.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsInner.java
index d8ff1f941b71..cd9f1fc72f7e 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsInner.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyEventsInner.java
@@ -10,13 +10,17 @@
 
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.QueryFailureException;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.QueryOptions;
-import com.microsoft.rest.ServiceCallback;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.Validator;
 import java.io.IOException;
+import java.util.List;
 import okhttp3.ResponseBody;
 import org.joda.time.DateTime;
 import retrofit2.http.GET;
@@ -25,6 +29,7 @@
 import retrofit2.http.Path;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
+import retrofit2.http.Url;
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
@@ -57,39 +62,67 @@ public PolicyEventsInner(Retrofit retrofit, PolicyInsightsClientImpl client) {
     interface PolicyEventsService {
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForManagementGroup" })
         @POST("providers/{managementGroupsNamespace}/managementGroups/{managementGroupName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForManagementGroup(@Path("policyEventsResource") String policyEventsResource, @Path("managementGroupsNamespace") String managementGroupsNamespace, @Path("managementGroupName") String managementGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForManagementGroup(@Path("policyEventsResource") String policyEventsResource, @Path("managementGroupsNamespace") String managementGroupsNamespace, @Path("managementGroupName") String managementGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForSubscription" })
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForSubscription(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForSubscription(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResourceGroup" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResourceGroup(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroup(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResource" })
         @POST("{resourceId}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResource(@Path("policyEventsResource") String policyEventsResource, @Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResource(@Path("policyEventsResource") String policyEventsResource, @Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$expand") String expand, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForPolicySetDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policySetDefinitions/{policySetDefinitionName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinition(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policySetDefinitionName") String policySetDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinition(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policySetDefinitionName") String policySetDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForPolicyDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyDefinitions/{policyDefinitionName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinition(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyDefinitionName") String policyDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinition(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyDefinitionName") String policyDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForSubscriptionLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignment(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignment(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResourceGroupLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyEvents/{policyEventsResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignment(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignment(@Path("policyEventsResource") String policyEventsResource, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents getMetadata" })
-        @GET("{scope}/providers/Microsoft.PolicyInsights/policyEvents/$metadata")
-        Observable<Response<ResponseBody>> getMetadata(@Path(value = "scope", encoded = true) String scope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForManagementGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForManagementGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForSubscriptionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResourceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForPolicySetDefinitionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinitionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForPolicyDefinitionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinitionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForSubscriptionLevelPolicyAssignmentNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignmentNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvents listQueryResultsForResourceGroupLevelPolicyAssignmentNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignmentNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
     }
 
@@ -100,10 +133,16 @@ interface PolicyEventsService {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForManagementGroup(String managementGroupName) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForManagementGroup(final String managementGroupName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForManagementGroupSinglePageAsync(managementGroupName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -114,8 +153,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForManagementGroup(String m
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForManagementGroupAsync(String managementGroupName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForManagementGroupAsync(final String managementGroupName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupSinglePageAsync(managementGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -123,15 +170,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForManagemen
      *
      * @param managementGroupName Management group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForManagementGroupAsync(String managementGroupName) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForManagementGroupAsync(final String managementGroupName) {
+        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -139,15 +187,36 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      *
      * @param managementGroupName Management group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForManagementGroupWithServiceResponseAsync(String managementGroupName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupWithServiceResponseAsync(final String managementGroupName) {
+        return listQueryResultsForManagementGroupSinglePageAsync(managementGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+     * @param managementGroupName Management group name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupSinglePageAsync(final String managementGroupName) {
         if (managementGroupName == null) {
             throw new IllegalArgumentException("Parameter managementGroupName is required and cannot be null.");
         }
         final String policyEventsResource = "default";
         final String managementGroupsNamespace = "Microsoft.Management";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -156,13 +225,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForManagementGroup(policyEventsResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForManagementGroup(policyEventsResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForManagementGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -178,10 +248,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForManagementGroup(String managementGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForManagementGroup(final String managementGroupName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForManagementGroupSinglePageAsync(managementGroupName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -193,8 +269,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForManagementGroup(String m
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForManagementGroupAsync(String managementGroupName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForManagementGroupAsync(final String managementGroupName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupSinglePageAsync(managementGroupName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -203,15 +287,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForManagemen
      * @param managementGroupName Management group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForManagementGroupAsync(String managementGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForManagementGroupAsync(final String managementGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForManagementGroupWithServiceResponseAsync(managementGroupName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -220,16 +305,38 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param managementGroupName Management group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupWithServiceResponseAsync(final String managementGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForManagementGroupSinglePageAsync(managementGroupName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param managementGroupName Management group name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForManagementGroupWithServiceResponseAsync(String managementGroupName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupSinglePageAsync(final String managementGroupName, final QueryOptions queryOptions) {
         if (managementGroupName == null) {
             throw new IllegalArgumentException("Parameter managementGroupName is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
         final String managementGroupsNamespace = "Microsoft.Management";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -258,13 +365,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForManagementGroup(policyEventsResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForManagementGroup(policyEventsResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForManagementGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -272,9 +383,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForManagementGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForManagementGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -286,10 +397,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForManage
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForSubscription(String subscriptionId) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForSubscription(final String subscriptionId) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionSinglePageAsync(subscriptionId).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -300,8 +417,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForSubscription(String subs
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionAsync(String subscriptionId, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionAsync(final String subscriptionId, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionSinglePageAsync(subscriptionId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -309,15 +434,37 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscript
      *
      * @param subscriptionId Microsoft Azure subscription ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionAsync(String subscriptionId) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionAsync(final String subscriptionId) {
+        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the subscription.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionWithServiceResponseAsync(final String subscriptionId) {
+        return listQueryResultsForSubscriptionSinglePageAsync(subscriptionId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -325,14 +472,14 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      *
      * @param subscriptionId Microsoft Azure subscription ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForSubscriptionWithServiceResponseAsync(String subscriptionId) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionSinglePageAsync(final String subscriptionId) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -341,13 +488,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForSubscription(policyEventsResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForSubscription(policyEventsResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForSubscriptionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -363,10 +511,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForSubscription(String subscriptionId, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForSubscription(final String subscriptionId, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionSinglePageAsync(subscriptionId, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -378,8 +532,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForSubscription(String subs
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionAsync(String subscriptionId, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionAsync(final String subscriptionId, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionSinglePageAsync(subscriptionId, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -388,15 +550,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscript
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionAsync(String subscriptionId, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionAsync(final String subscriptionId, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionWithServiceResponseAsync(subscriptionId, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -405,15 +568,37 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForSubscriptionWithServiceResponseAsync(String subscriptionId, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionWithServiceResponseAsync(final String subscriptionId, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionSinglePageAsync(subscriptionId, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the subscription.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionSinglePageAsync(final String subscriptionId, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -442,13 +627,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForSubscription(policyEventsResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForSubscription(policyEventsResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForSubscriptionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -456,9 +645,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForSubscriptionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -471,10 +660,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForSubscr
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResourceGroup(String subscriptionId, String resourceGroupName) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroup(final String subscriptionId, final String resourceGroupName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -486,8 +681,34 @@ public PolicyEventsQueryResultsInner listQueryResultsForResourceGroup(String sub
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resources under the resource group.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName) {
+        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -496,15 +717,20 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceG
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupWithServiceResponseAsync(final String subscriptionId, final String resourceGroupName) {
+        return listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -513,9 +739,9 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceGroupWithServiceResponseAsync(String subscriptionId, String resourceGroupName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupSinglePageAsync(final String subscriptionId, final String resourceGroupName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -523,7 +749,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
             throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -532,13 +758,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForResourceGroup(policyEventsResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForResourceGroup(policyEventsResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -555,10 +782,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResourceGroup(String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroup(final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -571,8 +804,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForResourceGroup(String sub
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -582,15 +823,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceG
      * @param resourceGroupName Resource group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupAsync(String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupAsync(final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupWithServiceResponseAsync(subscriptionId, resourceGroupName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -600,9 +842,32 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param resourceGroupName Resource group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupWithServiceResponseAsync(final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupSinglePageAsync(subscriptionId, resourceGroupName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the resource group.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param resourceGroupName Resource group name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceGroupWithServiceResponseAsync(String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupSinglePageAsync(final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -611,7 +876,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         }
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -640,13 +905,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForResourceGroup(policyEventsResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResourceGroup(policyEventsResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -654,9 +923,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -668,10 +937,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForResour
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResource(String resourceId) {
-        return listQueryResultsForResourceWithServiceResponseAsync(resourceId).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResource(final String resourceId) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceSinglePageAsync(resourceId).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -682,8 +957,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForResource(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceAsync(String resourceId, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceWithServiceResponseAsync(resourceId), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceAsync(final String resourceId, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceSinglePageAsync(resourceId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -691,15 +974,37 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceA
      *
      * @param resourceId Resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceAsync(String resourceId) {
-        return listQueryResultsForResourceWithServiceResponseAsync(resourceId).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceAsync(final String resourceId) {
+        return listQueryResultsForResourceWithServiceResponseAsync(resourceId)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+     * @param resourceId Resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceWithServiceResponseAsync(final String resourceId) {
+        return listQueryResultsForResourceSinglePageAsync(resourceId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -707,14 +1012,14 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      *
      * @param resourceId Resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceWithServiceResponseAsync(String resourceId) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceSinglePageAsync(final String resourceId) {
         if (resourceId == null) {
             throw new IllegalArgumentException("Parameter resourceId is required and cannot be null.");
         }
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -723,13 +1028,15 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForResource(policyEventsResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String expand = null;
+        String skipToken = null;
+        return service.listQueryResultsForResource(policyEventsResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -745,10 +1052,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResource(String resourceId, QueryOptions queryOptions) {
-        return listQueryResultsForResourceWithServiceResponseAsync(resourceId, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResource(final String resourceId, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceSinglePageAsync(resourceId, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -760,8 +1073,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForResource(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceAsync(String resourceId, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceWithServiceResponseAsync(resourceId, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceAsync(final String resourceId, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceSinglePageAsync(resourceId, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -770,15 +1091,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceA
      * @param resourceId Resource ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceAsync(String resourceId, QueryOptions queryOptions) {
-        return listQueryResultsForResourceWithServiceResponseAsync(resourceId, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceAsync(final String resourceId, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceWithServiceResponseAsync(resourceId, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -787,15 +1109,37 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param resourceId Resource ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceWithServiceResponseAsync(final String resourceId, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceSinglePageAsync(resourceId, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param resourceId Resource ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceWithServiceResponseAsync(String resourceId, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceSinglePageAsync(final String resourceId, final QueryOptions queryOptions) {
         if (resourceId == null) {
             throw new IllegalArgumentException("Parameter resourceId is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -824,13 +1168,21 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForResource(policyEventsResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String expand = null;
+        if (queryOptions != null) {
+            expand = queryOptions.expand();
+        }
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResource(policyEventsResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -838,9 +1190,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForResourceDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -853,10 +1205,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForResour
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForPolicySetDefinition(String subscriptionId, String policySetDefinitionName) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForPolicySetDefinition(final String subscriptionId, final String policySetDefinitionName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -868,8 +1226,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForPolicySetDefinition(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -878,15 +1244,38 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicySet
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName) {
+        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policySetDefinitionName Policy set definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(final String subscriptionId, final String policySetDefinitionName) {
+        return listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -895,9 +1284,9 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionSinglePageAsync(final String subscriptionId, final String policySetDefinitionName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -906,7 +1295,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         }
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -915,13 +1304,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForPolicySetDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForPolicySetDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForPolicySetDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicySetDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -938,10 +1328,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForPolicySetDefinition(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForPolicySetDefinition(final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -954,8 +1350,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForPolicySetDefinition(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -965,15 +1369,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicySet
      * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicySetDefinitionAsync(final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -983,9 +1388,32 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicySetDefinitionSinglePageAsync(subscriptionId, policySetDefinitionName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param policySetDefinitionName Policy set definition name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionSinglePageAsync(final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -995,7 +1423,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -1024,13 +1452,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForPolicySetDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForPolicySetDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForPolicySetDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicySetDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1038,9 +1470,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -1053,10 +1485,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForPolicy
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForPolicyDefinition(String subscriptionId, String policyDefinitionName) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForPolicyDefinition(final String subscriptionId, final String policyDefinitionName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1068,8 +1506,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForPolicyDefinition(String
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1078,15 +1524,38 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDef
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName) {
+        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policyDefinitionName Policy definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(final String subscriptionId, final String policyDefinitionName) {
+        return listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -1095,9 +1564,9 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionSinglePageAsync(final String subscriptionId, final String policyDefinitionName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1106,7 +1575,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         }
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -1115,13 +1584,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForPolicyDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForPolicyDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForPolicyDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicyDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1138,10 +1608,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForPolicyDefinition(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForPolicyDefinition(final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1154,8 +1630,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForPolicyDefinition(String
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1165,17 +1649,18 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDef
      * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
-    }
-
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicyDefinitionAsync(final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
     /**
      * Queries policy events for the subscription level policy definition.
      *
@@ -1183,9 +1668,32 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicyDefinitionSinglePageAsync(subscriptionId, policyDefinitionName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param policyDefinitionName Policy definition name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionSinglePageAsync(final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1195,7 +1703,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -1224,13 +1732,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForPolicyDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForPolicyDefinition(policyEventsResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForPolicyDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicyDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1238,9 +1750,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -1253,10 +1765,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForPolicy
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForSubscriptionLevelPolicyAssignment(final String subscriptionId, final String policyAssignmentName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1268,8 +1786,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForSubscriptionLevelPolicyA
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1278,15 +1804,38 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscript
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(final String subscriptionId, final String policyAssignmentName) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -1295,9 +1844,9 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(final String subscriptionId, final String policyAssignmentName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1306,7 +1855,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         }
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -1315,13 +1864,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyEventsResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyEventsResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1338,10 +1888,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForSubscriptionLevelPolicyAssignment(final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1354,8 +1910,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForSubscriptionLevelPolicyA
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1365,15 +1929,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForSubscript
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -1383,9 +1948,32 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(subscriptionId, policyAssignmentName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param policyAssignmentName Policy assignment name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1395,7 +1983,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -1424,13 +2012,17 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyEventsResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyEventsResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1438,9 +2030,9 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -1454,10 +2046,16 @@ private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForSubscr
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroupLevelPolicyAssignment(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1470,8 +2068,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForResourceGroupLevelPolicy
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1481,15 +2087,39 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceG
      * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -1499,9 +2129,9 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1513,7 +2143,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         }
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         final QueryOptions queryOptions = null;
         Integer top = null;
         String orderBy = null;
@@ -1522,13 +2152,14 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyEventsResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyEventsResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1546,10 +2177,16 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyEventsQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public PolicyEventsQueryResultsInner listQueryResultsForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroupLevelPolicyAssignment(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1563,8 +2200,16 @@ public PolicyEventsQueryResultsInner listQueryResultsForResourceGroupLevelPolicy
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<PolicyEventsQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1575,15 +2220,16 @@ public ServiceFuture<PolicyEventsQueryResultsInner> listQueryResultsForResourceG
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
      */
-    public Observable<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<PolicyEventsQueryResultsInner>, PolicyEventsQueryResultsInner>() {
-            @Override
-            public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -1594,9 +2240,33 @@ public PolicyEventsQueryResultsInner call(ServiceResponse<PolicyEventsQueryResul
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyEventsQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param resourceGroupName Resource group name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param policyAssignmentName Policy assignment name.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
@@ -1609,7 +2279,7 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         Validator.validate(queryOptions);
         final String policyEventsResource = "default";
         final String authorizationNamespace = "Microsoft.Authorization";
-        final String apiVersion = "2018-04-04";
+        final String apiVersion = "2019-10-01";
         Integer top = null;
         if (queryOptions != null) {
             top = queryOptions.top();
@@ -1638,13 +2308,128 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyEventsResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyEventsQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyEventsResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForManagementGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForManagementGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForManagementGroupNextAsync(final String nextPageLink) {
+        return listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the management group.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForManagementGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForManagementGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyEventsQueryResultsInner> clientResponse = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForManagementGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1652,73 +2437,776 @@ public Observable<ServiceResponse<PolicyEventsQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyEventsQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyEventsQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyEventsQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForManagementGroupNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Gets OData metadata XML document.
+     * Queries policy events for the resources under the subscription.
      *
-     * @param scope A valid scope, i.e. management group, subscription, resource group, or resource ID. Scope used has no effect on metadata returned.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the String object if successful.
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public String getMetadata(String scope) {
-        return getMetadataWithServiceResponseAsync(scope).toBlocking().single().body();
+    public PagedList<PolicyEventInner> listQueryResultsForSubscriptionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Gets OData metadata XML document.
+     * Queries policy events for the resources under the subscription.
      *
-     * @param scope A valid scope, i.e. management group, subscription, resource group, or resource ID. Scope used has no effect on metadata returned.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<String> getMetadataAsync(String scope, final ServiceCallback<String> serviceCallback) {
-        return ServiceFuture.fromResponse(getMetadataWithServiceResponseAsync(scope), serviceCallback);
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionNextAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the subscription.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForSubscriptionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForSubscriptionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
     }
 
     /**
-     * Gets OData metadata XML document.
+     * Queries policy events for the resources under the resource group.
      *
-     * @param scope A valid scope, i.e. management group, subscription, resource group, or resource ID. Scope used has no effect on metadata returned.
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
      */
-    public Observable<String> getMetadataAsync(String scope) {
-        return getMetadataWithServiceResponseAsync(scope).map(new Func1<ServiceResponse<String>, String>() {
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
             @Override
-            public String call(ServiceResponse<String> response) {
-                return response.body();
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
             }
-        });
+        };
+    }
+
+    /**
+     * Queries policy events for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
-     * Gets OData metadata XML document.
+     * Queries policy events for the resources under the resource group.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceGroupNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForResourceNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForPolicySetDefinitionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicySetDefinitionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicySetDefinitionNextAsync(final String nextPageLink) {
+        return listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy set definition.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicySetDefinitionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForPolicySetDefinitionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicySetDefinitionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForPolicySetDefinitionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForPolicyDefinitionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForPolicyDefinitionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForPolicyDefinitionNextAsync(final String nextPageLink) {
+        return listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy definition.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForPolicyDefinitionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForPolicyDefinitionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForPolicyDefinitionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForPolicyDefinitionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForSubscriptionLevelPolicyAssignmentNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the subscription level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyEventInner&gt; object if successful.
+     */
+    public PagedList<PolicyEventInner> listQueryResultsForResourceGroupLevelPolicyAssignmentNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyEventInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyEventInner>(response.body()) {
+            @Override
+            public Page<PolicyEventInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyEventInner>> serviceFuture, final ListOperationCallback<PolicyEventInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<Page<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyEventInner>>, Page<PolicyEventInner>>() {
+                @Override
+                public Page<PolicyEventInner> call(ServiceResponse<Page<PolicyEventInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyEventInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyEventInner>>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(ServiceResponse<Page<PolicyEventInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy events for the resource group level policy assignment.
      *
-     * @param scope A valid scope, i.e. management group, subscription, resource group, or resource ID. Scope used has no effect on metadata returned.
+    ServiceResponse<PageImpl1<PolicyEventInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the String object
+     * @return the PagedList&lt;PolicyEventInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<String>> getMetadataWithServiceResponseAsync(String scope) {
-        if (scope == null) {
-            throw new IllegalArgumentException("Parameter scope is required and cannot be null.");
+    public Observable<ServiceResponse<Page<PolicyEventInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
         }
-        final String apiVersion = "2018-04-04";
-        return service.getMetadata(scope, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<String>>>() {
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyEventInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<String>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyEventInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<String> clientResponse = getMetadataDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyEventInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyEventInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1726,9 +3214,9 @@ public Observable<ServiceResponse<String>> call(Response<ResponseBody> response)
             });
     }
 
-    private ServiceResponse<String> getMetadataDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<String, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<String>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyEventInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyEventInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyEventInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyInsightsClientImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyInsightsClientImpl.java
index 074ac33762e2..749b66cd0428 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyInsightsClientImpl.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyInsightsClientImpl.java
@@ -10,6 +10,8 @@
 
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.RestClient;
 
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateImpl.java
new file mode 100644
index 000000000000..f854c1019eaa
--- /dev/null
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateImpl.java
@@ -0,0 +1,206 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.policyinsights.v2019_10_01.implementation;
+
+import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyState;
+import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.Map;
+import java.util.List;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.ComponentStateDetails;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvaluationDetails;
+import org.joda.time.DateTime;
+
+class PolicyStateImpl extends WrapperImpl<PolicyStateInner> implements PolicyState {
+    private final PolicyInsightsManager manager;
+    PolicyStateImpl(PolicyStateInner inner, PolicyInsightsManager manager) {
+        super(inner);
+        this.manager = manager;
+    }
+
+    @Override
+    public PolicyInsightsManager manager() {
+        return this.manager;
+    }
+
+    @Override
+    public Map<String, Object> additionalProperties() {
+        return this.inner().additionalProperties();
+    }
+
+    @Override
+    public String complianceState() {
+        return this.inner().complianceState();
+    }
+
+    @Override
+    public List<ComponentStateDetails> components() {
+        return this.inner().components();
+    }
+
+    @Override
+    public String effectiveParameters() {
+        return this.inner().effectiveParameters();
+    }
+
+    @Override
+    public Boolean isCompliant() {
+        return this.inner().isCompliant();
+    }
+
+    @Override
+    public String managementGroupIds() {
+        return this.inner().managementGroupIds();
+    }
+
+    @Override
+    public String odatacontext() {
+        return this.inner().odatacontext();
+    }
+
+    @Override
+    public String odataid() {
+        return this.inner().odataid();
+    }
+
+    @Override
+    public String policyAssignmentId() {
+        return this.inner().policyAssignmentId();
+    }
+
+    @Override
+    public String policyAssignmentName() {
+        return this.inner().policyAssignmentName();
+    }
+
+    @Override
+    public String policyAssignmentOwner() {
+        return this.inner().policyAssignmentOwner();
+    }
+
+    @Override
+    public String policyAssignmentParameters() {
+        return this.inner().policyAssignmentParameters();
+    }
+
+    @Override
+    public String policyAssignmentScope() {
+        return this.inner().policyAssignmentScope();
+    }
+
+    @Override
+    public String policyAssignmentVersion() {
+        return this.inner().policyAssignmentVersion();
+    }
+
+    @Override
+    public String policyDefinitionAction() {
+        return this.inner().policyDefinitionAction();
+    }
+
+    @Override
+    public String policyDefinitionCategory() {
+        return this.inner().policyDefinitionCategory();
+    }
+
+    @Override
+    public List<String> policyDefinitionGroupNames() {
+        return this.inner().policyDefinitionGroupNames();
+    }
+
+    @Override
+    public String policyDefinitionId() {
+        return this.inner().policyDefinitionId();
+    }
+
+    @Override
+    public String policyDefinitionName() {
+        return this.inner().policyDefinitionName();
+    }
+
+    @Override
+    public String policyDefinitionReferenceId() {
+        return this.inner().policyDefinitionReferenceId();
+    }
+
+    @Override
+    public String policyDefinitionVersion() {
+        return this.inner().policyDefinitionVersion();
+    }
+
+    @Override
+    public PolicyEvaluationDetails policyEvaluationDetails() {
+        return this.inner().policyEvaluationDetails();
+    }
+
+    @Override
+    public String policySetDefinitionCategory() {
+        return this.inner().policySetDefinitionCategory();
+    }
+
+    @Override
+    public String policySetDefinitionId() {
+        return this.inner().policySetDefinitionId();
+    }
+
+    @Override
+    public String policySetDefinitionName() {
+        return this.inner().policySetDefinitionName();
+    }
+
+    @Override
+    public String policySetDefinitionOwner() {
+        return this.inner().policySetDefinitionOwner();
+    }
+
+    @Override
+    public String policySetDefinitionParameters() {
+        return this.inner().policySetDefinitionParameters();
+    }
+
+    @Override
+    public String policySetDefinitionVersion() {
+        return this.inner().policySetDefinitionVersion();
+    }
+
+    @Override
+    public String resourceGroup() {
+        return this.inner().resourceGroup();
+    }
+
+    @Override
+    public String resourceId() {
+        return this.inner().resourceId();
+    }
+
+    @Override
+    public String resourceLocation() {
+        return this.inner().resourceLocation();
+    }
+
+    @Override
+    public String resourceTags() {
+        return this.inner().resourceTags();
+    }
+
+    @Override
+    public String resourceType() {
+        return this.inner().resourceType();
+    }
+
+    @Override
+    public String subscriptionId() {
+        return this.inner().subscriptionId();
+    }
+
+    @Override
+    public DateTime timestamp() {
+        return this.inner().timestamp();
+    }
+
+}
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateInner.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateInner.java
index ccb6f3383dcd..2fd3c4d807cb 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateInner.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStateInner.java
@@ -12,6 +12,7 @@
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyEvaluationDetails;
 import java.util.List;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.ComponentStateDetails;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -214,6 +215,31 @@ public class PolicyStateInner {
     @JsonProperty(value = "policyDefinitionGroupNames")
     private List<String> policyDefinitionGroupNames;
 
+    /**
+     * Components state compliance records populated only when URL contains
+     * $expand=components clause.
+     */
+    @JsonProperty(value = "components")
+    private List<ComponentStateDetails> components;
+
+    /**
+     * Evaluated policy definition version.
+     */
+    @JsonProperty(value = "policyDefinitionVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String policyDefinitionVersion;
+
+    /**
+     * Evaluated policy set definition version.
+     */
+    @JsonProperty(value = "policySetDefinitionVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String policySetDefinitionVersion;
+
+    /**
+     * Evaluated policy assignment version.
+     */
+    @JsonProperty(value = "policyAssignmentVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String policyAssignmentVersion;
+
     /**
      * Get unmatched properties from the message are deserialized this collection.
      *
@@ -834,4 +860,51 @@ public PolicyStateInner withPolicyDefinitionGroupNames(List<String> policyDefini
         return this;
     }
 
+    /**
+     * Get components state compliance records populated only when URL contains $expand=components clause.
+     *
+     * @return the components value
+     */
+    public List<ComponentStateDetails> components() {
+        return this.components;
+    }
+
+    /**
+     * Set components state compliance records populated only when URL contains $expand=components clause.
+     *
+     * @param components the components value to set
+     * @return the PolicyStateInner object itself.
+     */
+    public PolicyStateInner withComponents(List<ComponentStateDetails> components) {
+        this.components = components;
+        return this;
+    }
+
+    /**
+     * Get evaluated policy definition version.
+     *
+     * @return the policyDefinitionVersion value
+     */
+    public String policyDefinitionVersion() {
+        return this.policyDefinitionVersion;
+    }
+
+    /**
+     * Get evaluated policy set definition version.
+     *
+     * @return the policySetDefinitionVersion value
+     */
+    public String policySetDefinitionVersion() {
+        return this.policySetDefinitionVersion;
+    }
+
+    /**
+     * Get evaluated policy assignment version.
+     *
+     * @return the policyAssignmentVersion value
+     */
+    public String policyAssignmentVersion() {
+        return this.policyAssignmentVersion;
+    }
+
 }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesImpl.java
index bf7a59f3ddb8..b6939a98271a 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesImpl.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesImpl.java
@@ -11,9 +11,11 @@
 
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates;
+import rx.Completable;
 import rx.functions.Func1;
 import rx.Observable;
-import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStatesQueryResults;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyState;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.SummarizeResults;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStatesResource;
 
@@ -30,13 +32,19 @@ public PolicyInsightsManager manager() {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName) {
+    public Observable<PolicyState> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForManagementGroupAsync(policyStatesResource, managementGroupName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
+            @Override
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -54,13 +62,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId) {
+    public Observable<PolicyState> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForSubscriptionAsync(policyStatesResource, subscriptionId)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
+            @Override
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -78,13 +92,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName) {
+    public Observable<PolicyState> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForResourceGroupAsync(policyStatesResource, subscriptionId, resourceGroupName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
+            @Override
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -102,13 +122,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId) {
+    public Observable<PolicyState> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForResourceAsync(policyStatesResource, resourceId)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
+            @Override
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -126,13 +152,31 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName) {
+    public Completable triggerSubscriptionEvaluationAsync(String subscriptionId) {
+        PolicyStatesInner client = this.inner();
+        return client.triggerSubscriptionEvaluationAsync(subscriptionId).toCompletable();
+    }
+
+    @Override
+    public Completable triggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName) {
+        PolicyStatesInner client = this.inner();
+        return client.triggerResourceGroupEvaluationAsync(subscriptionId, resourceGroupName).toCompletable();
+    }
+
+    @Override
+    public Observable<PolicyState> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForPolicySetDefinitionAsync(policyStatesResource, subscriptionId, policySetDefinitionName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
+            @Override
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -150,13 +194,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName) {
+    public Observable<PolicyState> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForPolicyDefinitionAsync(policyStatesResource, subscriptionId, policyDefinitionName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
+            @Override
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -174,13 +224,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName) {
+    public Observable<PolicyState> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(policyStatesResource, subscriptionId, policyAssignmentName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
+            @Override
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
@@ -198,13 +254,19 @@ public SummarizeResults call(SummarizeResultsInner inner) {
     }
 
     @Override
-    public Observable<PolicyStatesQueryResults> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+    public Observable<PolicyState> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
         PolicyStatesInner client = this.inner();
         return client.listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName)
-        .map(new Func1<PolicyStatesQueryResultsInner, PolicyStatesQueryResults>() {
+        .flatMapIterable(new Func1<Page<PolicyStateInner>, Iterable<PolicyStateInner>>() {
+            @Override
+            public Iterable<PolicyStateInner> call(Page<PolicyStateInner> page) {
+                return page.items();
+            }
+        })
+        .map(new Func1<PolicyStateInner, PolicyState>() {
             @Override
-            public PolicyStatesQueryResults call(PolicyStatesQueryResultsInner inner) {
-                return new PolicyStatesQueryResultsImpl(inner, manager());
+            public PolicyState call(PolicyStateInner inner) {
+                return new PolicyStateImpl(inner, manager());
             }
         });
     }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesInner.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesInner.java
index bc4c4cca0791..5450c301dfa5 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesInner.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/PolicyStatesInner.java
@@ -10,24 +10,33 @@
 
 import retrofit2.Retrofit;
 import com.google.common.reflect.TypeToken;
+import com.microsoft.azure.AzureServiceFuture;
+import com.microsoft.azure.ListOperationCallback;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStatesResource;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.QueryFailureException;
 import com.microsoft.azure.management.policyinsights.v2019_10_01.QueryOptions;
+import com.microsoft.azure.Page;
+import com.microsoft.azure.PagedList;
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceFuture;
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.Validator;
 import java.io.IOException;
+import java.util.List;
 import okhttp3.ResponseBody;
 import org.joda.time.DateTime;
+import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.Path;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
+import retrofit2.http.Url;
 import retrofit2.Response;
 import rx.functions.Func1;
 import rx.Observable;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 
 /**
  * An instance of this class provides access to all the operations defined
@@ -57,7 +66,7 @@ public PolicyStatesInner(Retrofit retrofit, PolicyInsightsClientImpl client) {
     interface PolicyStatesService {
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForManagementGroup" })
         @POST("providers/{managementGroupsNamespace}/managementGroups/{managementGroupName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForManagementGroup(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("managementGroupsNamespace") String managementGroupsNamespace, @Path("managementGroupName") String managementGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForManagementGroup(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("managementGroupsNamespace") String managementGroupsNamespace, @Path("managementGroupName") String managementGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForManagementGroup" })
         @POST("providers/{managementGroupsNamespace}/managementGroups/{managementGroupName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -65,7 +74,7 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForSubscription" })
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForSubscription(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForSubscription(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForSubscription" })
         @POST("subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -73,7 +82,7 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResourceGroup" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResourceGroup(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroup(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForResourceGroup" })
         @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -81,15 +90,31 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResource" })
         @POST("{resourceId}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResource(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$expand") String expand, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResource(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$expand") String expand, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForResource" })
         @POST("{resourceId}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
         Observable<Response<ResponseBody>> summarizeForResource(@Path("policyStatesSummaryResource") String policyStatesSummaryResource, @Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates triggerSubscriptionEvaluation" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/policyStates/latest/triggerEvaluation")
+        Observable<Response<ResponseBody>> triggerSubscriptionEvaluation(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates beginTriggerSubscriptionEvaluation" })
+        @POST("subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/policyStates/latest/triggerEvaluation")
+        Observable<Response<ResponseBody>> beginTriggerSubscriptionEvaluation(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates triggerResourceGroupEvaluation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/policyStates/latest/triggerEvaluation")
+        Observable<Response<ResponseBody>> triggerResourceGroupEvaluation(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates beginTriggerResourceGroupEvaluation" })
+        @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/policyStates/latest/triggerEvaluation")
+        Observable<Response<ResponseBody>> beginTriggerResourceGroupEvaluation(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForPolicySetDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policySetDefinitions/{policySetDefinitionName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinition(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policySetDefinitionName") String policySetDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinition(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policySetDefinitionName") String policySetDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForPolicySetDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policySetDefinitions/{policySetDefinitionName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -97,7 +122,7 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForPolicyDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyDefinitions/{policyDefinitionName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinition(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyDefinitionName") String policyDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinition(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyDefinitionName") String policyDefinitionName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForPolicyDefinition" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyDefinitions/{policyDefinitionName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -105,7 +130,7 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForSubscriptionLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignment(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignment(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForSubscriptionLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
@@ -113,12 +138,44 @@ interface PolicyStatesService {
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResourceGroupLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesResource}/queryResults")
-        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignment(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignment(@Path("policyStatesResource") PolicyStatesResource policyStatesResource1, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$orderby") String orderBy, @Query("$select") String select, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Query("$apply") String apply, @Query("$skiptoken") String skipToken, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates summarizeForResourceGroupLevelPolicyAssignment" })
         @POST("subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{authorizationNamespace}/policyAssignments/{policyAssignmentName}/providers/Microsoft.PolicyInsights/policyStates/{policyStatesSummaryResource}/summarize")
         Observable<Response<ResponseBody>> summarizeForResourceGroupLevelPolicyAssignment(@Path("policyStatesSummaryResource") String policyStatesSummaryResource, @Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("authorizationNamespace") String authorizationNamespace, @Path("policyAssignmentName") String policyAssignmentName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Query("$top") Integer top, @Query("$from") DateTime from, @Query("$to") DateTime to, @Query("$filter") String filter, @Header("User-Agent") String userAgent);
 
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForManagementGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForManagementGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForSubscriptionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResourceGroupNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResourceNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForPolicySetDefinitionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForPolicySetDefinitionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForPolicyDefinitionNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForPolicyDefinitionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForSubscriptionLevelPolicyAssignmentNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForSubscriptionLevelPolicyAssignmentNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.policyinsights.v2019_10_01.PolicyStates listQueryResultsForResourceGroupLevelPolicyAssignmentNext" })
+        @GET
+        Observable<Response<ResponseBody>> listQueryResultsForResourceGroupLevelPolicyAssignmentNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
     }
 
     /**
@@ -129,10 +186,16 @@ interface PolicyStatesService {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForManagementGroup(PolicyStatesResource policyStatesResource, String managementGroupName) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForManagementGroup(final PolicyStatesResource policyStatesResource, final String managementGroupName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -144,8 +207,34 @@ public PolicyStatesQueryResultsInner listQueryResultsForManagementGroup(PolicySt
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param managementGroupName Management group name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName) {
+        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -154,15 +243,20 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForManagemen
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param managementGroupName Management group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName) {
+        return listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -171,9 +265,9 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param managementGroupName Management group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForManagementGroupWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String managementGroupName) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupSinglePageAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -190,13 +284,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForManagementGroup(policyStatesResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForManagementGroup(policyStatesResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForManagementGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -213,10 +308,16 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForManagementGroup(PolicyStatesResource policyStatesResource, String managementGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForManagementGroup(final PolicyStatesResource policyStatesResource, final String managementGroupName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -229,8 +330,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForManagementGroup(PolicySt
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -240,15 +349,16 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForManagemen
      * @param managementGroupName Management group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForManagementGroupAsync(PolicyStatesResource policyStatesResource, String managementGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForManagementGroupAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForManagementGroupWithServiceResponseAsync(policyStatesResource, managementGroupName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -258,9 +368,32 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param managementGroupName Management group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForManagementGroupWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String managementGroupName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForManagementGroupSinglePageAsync(policyStatesResource, managementGroupName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param managementGroupName Management group name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupSinglePageAsync(final PolicyStatesResource policyStatesResource, final String managementGroupName, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -298,13 +431,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForManagementGroup(policyStatesResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForManagementGroup(policyStatesResource, managementGroupsNamespace, managementGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForManagementGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForManagementGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -312,9 +449,9 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForManagementGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForManagementGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -498,10 +635,16 @@ private ServiceResponse<SummarizeResultsInner> summarizeForManagementGroupDelega
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForSubscription(PolicyStatesResource policyStatesResource, String subscriptionId) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForSubscription(final PolicyStatesResource policyStatesResource, final String subscriptionId) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -513,8 +656,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForSubscription(PolicyState
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -523,15 +674,38 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscript
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId) {
+        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId) {
+        return listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -540,9 +714,9 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForSubscriptionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -558,13 +732,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForSubscription(policyStatesResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForSubscription(policyStatesResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForSubscriptionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -581,10 +756,16 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForSubscription(PolicyStatesResource policyStatesResource, String subscriptionId, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForSubscription(final PolicyStatesResource policyStatesResource, final String subscriptionId, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -597,8 +778,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForSubscription(PolicyState
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -608,15 +797,16 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscript
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionWithServiceResponseAsync(policyStatesResource, subscriptionId, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -626,9 +816,32 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionSinglePageAsync(policyStatesResource, subscriptionId, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForSubscriptionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -665,13 +878,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForSubscription(policyStatesResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForSubscription(policyStatesResource, subscriptionId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForSubscriptionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -679,9 +896,9 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForSubscriptionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -864,10 +1081,16 @@ private ServiceResponse<SummarizeResultsInner> summarizeForSubscriptionDelegate(
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResourceGroup(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroup(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -880,8 +1103,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForResourceGroup(PolicyStat
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -891,15 +1122,39 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceG
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName) {
+        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName) {
+        return listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -909,9 +1164,9 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param subscriptionId Microsoft Azure subscription ID.
      * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceGroupWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -930,13 +1185,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForResourceGroup(policyStatesResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForResourceGroup(policyStatesResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -954,10 +1210,16 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResourceGroup(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroup(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -971,8 +1233,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForResourceGroup(PolicyStat
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -983,15 +1253,16 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceG
      * @param resourceGroupName Resource group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -1002,9 +1273,33 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param resourceGroupName Resource group name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param resourceGroupName Resource group name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceGroupWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -1044,13 +1339,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForResourceGroup(policyStatesResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResourceGroup(policyStatesResource, subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceGroupDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1058,9 +1357,9 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceGroupDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -1256,10 +1555,16 @@ private ServiceResponse<SummarizeResultsInner> summarizeForResourceGroupDelegate
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResource(PolicyStatesResource policyStatesResource, String resourceId) {
-        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForResource(final PolicyStatesResource policyStatesResource, final String resourceId) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1271,8 +1576,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForResource(PolicyStatesRes
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1281,15 +1594,38 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceA
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param resourceId Resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId) {
-        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId) {
+        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param resourceId Resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String resourceId) {
+        return listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
     }
 
     /**
@@ -1298,9 +1634,9 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param resourceId Resource ID.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String resourceId) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceSinglePageAsync(final PolicyStatesResource policyStatesResource, final String resourceId) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -1317,13 +1653,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         String filter = null;
         String apply = null;
         String expand = null;
-        return service.listQueryResultsForResource(policyStatesResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForResource(policyStatesResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1340,10 +1677,16 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResource(PolicyStatesResource policyStatesResource, String resourceId, QueryOptions queryOptions) {
-        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForResource(final PolicyStatesResource policyStatesResource, final String resourceId, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
@@ -1356,8 +1699,16 @@ public PolicyStatesQueryResultsInner listQueryResultsForResource(PolicyStatesRes
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
@@ -1367,15 +1718,16 @@ public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceA
      * @param resourceId Resource ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceAsync(PolicyStatesResource policyStatesResource, String resourceId, QueryOptions queryOptions) {
-        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceAsync(final PolicyStatesResource policyStatesResource, final String resourceId, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceWithServiceResponseAsync(policyStatesResource, resourceId, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
@@ -1385,9 +1737,32 @@ public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResul
      * @param resourceId Resource ID.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String resourceId, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceSinglePageAsync(policyStatesResource, resourceId, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param resourceId Resource ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String resourceId, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceSinglePageAsync(final PolicyStatesResource policyStatesResource, final String resourceId, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
@@ -1428,13 +1803,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             expand = queryOptions.expand();
         }
-        return service.listQueryResultsForResource(policyStatesResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResource(policyStatesResource, resourceId, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, expand, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -1442,9 +1821,9 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForResourceDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
@@ -1619,202 +1998,119 @@ private ServiceResponse<SummarizeResultsInner> summarizeForResourceDelegate(Resp
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForPolicySetDefinition(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName).toBlocking().single().body();
+    public void triggerSubscriptionEvaluation(String subscriptionId) {
+        triggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId).toBlocking().last().body();
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName), serviceCallback);
+    public ServiceFuture<Void> triggerSubscriptionEvaluationAsync(String subscriptionId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(triggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId), serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable for the request
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
+    public Observable<Void> triggerSubscriptionEvaluationAsync(String subscriptionId) {
+        return triggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable for the request
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName) {
-        if (policyStatesResource == null) {
-            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
-        }
+    public Observable<ServiceResponse<Void>> triggerSubscriptionEvaluationWithServiceResponseAsync(String subscriptionId) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policySetDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
-        }
-        final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
-        final QueryOptions queryOptions = null;
-        Integer top = null;
-        String orderBy = null;
-        String select = null;
-        DateTime from = null;
-        DateTime to = null;
-        String filter = null;
-        String apply = null;
-        return service.listQueryResultsForPolicySetDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
-                @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForPolicySetDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
+        Observable<Response<ResponseBody>> observable = service.triggerSubscriptionEvaluation(subscriptionId, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForPolicySetDefinition(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single().body();
+    public void beginTriggerSubscriptionEvaluation(String subscriptionId) {
+        beginTriggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId).toBlocking().single().body();
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<Void> beginTriggerSubscriptionEvaluationAsync(String subscriptionId, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginTriggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId), serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForPolicySetDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
+    public Observable<Void> beginTriggerSubscriptionEvaluationAsync(String subscriptionId) {
+        return beginTriggerSubscriptionEvaluationWithServiceResponseAsync(subscriptionId).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Queries policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the subscription.
      *
-     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        if (policyStatesResource == null) {
-            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
-        }
+    public Observable<ServiceResponse<Void>> beginTriggerSubscriptionEvaluationWithServiceResponseAsync(String subscriptionId) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policySetDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
-        }
-        Validator.validate(queryOptions);
-        final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
-        Integer top = null;
-        if (queryOptions != null) {
-            top = queryOptions.top();
-        }
-        String orderBy = null;
-        if (queryOptions != null) {
-            orderBy = queryOptions.orderBy();
-        }
-        String select = null;
-        if (queryOptions != null) {
-            select = queryOptions.select();
-        }
-        DateTime from = null;
-        if (queryOptions != null) {
-            from = queryOptions.from();
-        }
-        DateTime to = null;
-        if (queryOptions != null) {
-            to = queryOptions.to();
-        }
-        String filter = null;
-        if (queryOptions != null) {
-            filter = queryOptions.filter();
-        }
-        String apply = null;
-        if (queryOptions != null) {
-            apply = queryOptions.apply();
-        }
-        return service.listQueryResultsForPolicySetDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        return service.beginTriggerSubscriptionEvaluation(subscriptionId, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForPolicySetDefinitionDelegate(response);
+                        ServiceResponse<Void> clientResponse = beginTriggerSubscriptionEvaluationDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -1823,183 +2119,142 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<Void> beginTriggerSubscriptionEvaluationDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForPolicySetDefinition(String subscriptionId, String policySetDefinitionName) {
-        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).toBlocking().single().body();
+    public void triggerResourceGroupEvaluation(String subscriptionId, String resourceGroupName) {
+        triggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName).toBlocking().last().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
+     * @param resourceGroupName Resource group name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName), serviceCallback);
+    public ServiceFuture<Void> triggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(triggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the SummarizeResultsInner object
+     * @return the observable for the request
      */
-    public Observable<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName) {
-        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<Void> triggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName) {
+        return triggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the SummarizeResultsInner object
+     * @return the observable for the request
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName) {
+    public Observable<ServiceResponse<Void>> triggerResourceGroupEvaluationWithServiceResponseAsync(String subscriptionId, String resourceGroupName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policySetDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
-        final String policyStatesSummaryResource = "latest";
-        final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
-        final QueryOptions queryOptions = null;
-        Integer top = null;
-        DateTime from = null;
-        DateTime to = null;
-        String filter = null;
-        return service.summarizeForPolicySetDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
-                @Override
-                public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
-                    try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicySetDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
-                    } catch (Throwable t) {
-                        return Observable.error(t);
-                    }
-                }
-            });
+        Observable<Response<ResponseBody>> observable = service.triggerResourceGroupEvaluation(subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent());
+        return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<Void>() { }.getType());
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForPolicySetDefinition(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single().body();
+    public void beginTriggerResourceGroupEvaluation(String subscriptionId, String resourceGroupName) {
+        beginTriggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
+     * @param resourceGroupName Resource group name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<Void> beginTriggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName, final ServiceCallback<Void> serviceCallback) {
+        return ServiceFuture.fromResponse(beginTriggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the SummarizeResultsInner object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
-        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<Void> beginTriggerResourceGroupEvaluationAsync(String subscriptionId, String resourceGroupName) {
+        return beginTriggerResourceGroupEvaluationWithServiceResponseAsync(subscriptionId, resourceGroupName).map(new Func1<ServiceResponse<Void>, Void>() {
             @Override
-            public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
+            public Void call(ServiceResponse<Void> response) {
                 return response.body();
             }
         });
     }
 
     /**
-     * Summarizes policy states for the subscription level policy set definition.
+     * Triggers a policy evaluation scan for all the resources under the resource group.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policySetDefinitionName Policy set definition name.
-     * @param queryOptions Additional parameters for the operation
+     * @param resourceGroupName Resource group name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the SummarizeResultsInner object
+     * @return the {@link ServiceResponse} object if successful.
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Void>> beginTriggerResourceGroupEvaluationWithServiceResponseAsync(String subscriptionId, String resourceGroupName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policySetDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
         }
-        Validator.validate(queryOptions);
-        final String policyStatesSummaryResource = "latest";
-        final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
-        Integer top = null;
-        if (queryOptions != null) {
-            top = queryOptions.top();
-        }
-        DateTime from = null;
-        if (queryOptions != null) {
-            from = queryOptions.from();
-        }
-        DateTime to = null;
-        if (queryOptions != null) {
-            to = queryOptions.to();
-        }
-        String filter = null;
-        if (queryOptions != null) {
-            filter = queryOptions.filter();
-        }
-        return service.summarizeForPolicySetDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
+        return service.beginTriggerResourceGroupEvaluation(subscriptionId, resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Void>>>() {
                 @Override
-                public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Void>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicySetDefinitionDelegate(response);
+                        ServiceResponse<Void> clientResponse = beginTriggerResourceGroupEvaluationDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2008,78 +2263,117 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
             });
     }
 
-    private ServiceResponse<SummarizeResultsInner> summarizeForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<SummarizeResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<SummarizeResultsInner>() { }.getType())
+    private ServiceResponse<Void> beginTriggerResourceGroupEvaluationDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<Void, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .register(202, new TypeToken<Void>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForPolicyDefinition(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForPolicySetDefinition(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName) {
+        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName) {
+        return listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
         }
         final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
@@ -2091,13 +2385,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForPolicyDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForPolicySetDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForPolicyDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicySetDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -2106,74 +2401,113 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForPolicyDefinition(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForPolicySetDefinition(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForPolicyDefinitionAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicySetDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the subscription level policy definition.
+     * Queries policy states for the subscription level policy set definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicySetDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policySetDefinitionName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policySetDefinitionName Policy set definition name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policySetDefinitionName, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String authorizationNamespace = "Microsoft.Authorization";
@@ -2206,13 +2540,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForPolicyDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForPolicySetDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForPolicyDefinitionDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicySetDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -2220,50 +2558,50 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForPolicyDefinition(String subscriptionId, String policyDefinitionName) {
-        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForPolicySetDefinition(String subscriptionId, String policySetDefinitionName) {
+        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName) {
-        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName) {
+        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -2272,19 +2610,19 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
         }
         final String policyStatesSummaryResource = "latest";
         final String authorizationNamespace = "Microsoft.Authorization";
@@ -2294,12 +2632,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefi
         DateTime from = null;
         DateTime to = null;
         String filter = null;
-        return service.summarizeForPolicyDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForPolicySetDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicyDefinitionDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicySetDefinitionDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2309,45 +2647,45 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForPolicyDefinition(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForPolicySetDefinition(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
+        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
-        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForPolicySetDefinitionAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
+        return summarizeForPolicySetDefinitionWithServiceResponseAsync(subscriptionId, policySetDefinitionName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -2356,20 +2694,20 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the subscription level policy definition.
+     * Summarizes policy states for the subscription level policy set definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyDefinitionName Policy definition name.
+     * @param policySetDefinitionName Policy set definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicySetDefinitionWithServiceResponseAsync(String subscriptionId, String policySetDefinitionName, QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyDefinitionName == null) {
-            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
+        if (policySetDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policySetDefinitionName is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String policyStatesSummaryResource = "latest";
@@ -2391,12 +2729,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefi
         if (queryOptions != null) {
             filter = queryOptions.filter();
         }
-        return service.summarizeForPolicyDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForPolicySetDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policySetDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicyDefinitionDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicySetDefinitionDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2405,7 +2743,7 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
             });
     }
 
-    private ServiceResponse<SummarizeResultsInner> summarizeForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+    private ServiceResponse<SummarizeResultsInner> summarizeForPolicySetDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<SummarizeResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SummarizeResultsInner>() { }.getType())
                 .registerError(QueryFailureException.class)
@@ -2413,70 +2751,108 @@ private ServiceResponse<SummarizeResultsInner> summarizeForPolicyDefinitionDeleg
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForSubscriptionLevelPolicyAssignment(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForPolicyDefinition(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName) {
+        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName) {
+        return listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyAssignmentName == null) {
-            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
         }
         final String authorizationNamespace = "Microsoft.Authorization";
         final String apiVersion = "2019-10-01";
@@ -2488,13 +2864,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyStatesResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForPolicyDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicyDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -2503,74 +2880,113 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForSubscriptionLevelPolicyAssignment(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForPolicyDefinition(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicyDefinitionAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicyDefinitionWithServiceResponseAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the subscription level policy assignment.
+     * Queries policy states for the subscription level policy definition.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
+        return listQueryResultsForPolicyDefinitionSinglePageAsync(policyStatesResource, subscriptionId, policyDefinitionName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyDefinitionName Policy definition name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyDefinitionName, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyAssignmentName == null) {
-            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String authorizationNamespace = "Microsoft.Authorization";
@@ -2603,13 +3019,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyStatesResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForPolicyDefinition(policyStatesResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicyDefinitionDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -2617,50 +3037,50 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName) {
-        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForPolicyDefinition(String subscriptionId, String policyDefinitionName) {
+        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName) {
-        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName) {
+        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -2669,19 +3089,19 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyAssignmentName == null) {
-            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
         }
         final String policyStatesSummaryResource = "latest";
         final String authorizationNamespace = "Microsoft.Authorization";
@@ -2691,12 +3111,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscripti
         DateTime from = null;
         DateTime to = null;
         String filter = null;
-        return service.summarizeForSubscriptionLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForPolicyDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicyDefinitionDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2706,45 +3126,45 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForPolicyDefinition(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
+        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
-        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForPolicyDefinitionAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
+        return summarizeForPolicyDefinitionWithServiceResponseAsync(subscriptionId, policyDefinitionName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -2753,20 +3173,20 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the subscription level policy assignment.
+     * Summarizes policy states for the subscription level policy definition.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param policyAssignmentName Policy assignment name.
+     * @param policyDefinitionName Policy definition name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForPolicyDefinitionWithServiceResponseAsync(String subscriptionId, String policyDefinitionName, QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (policyAssignmentName == null) {
-            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        if (policyDefinitionName == null) {
+            throw new IllegalArgumentException("Parameter policyDefinitionName is required and cannot be null.");
         }
         Validator.validate(queryOptions);
         final String policyStatesSummaryResource = "latest";
@@ -2788,12 +3208,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscripti
         if (queryOptions != null) {
             filter = queryOptions.filter();
         }
-        return service.summarizeForSubscriptionLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForPolicyDefinition(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyDefinitionName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForPolicyDefinitionDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -2802,7 +3222,7 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
             });
     }
 
-    private ServiceResponse<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+    private ServiceResponse<SummarizeResultsInner> summarizeForPolicyDefinitionDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<SummarizeResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SummarizeResultsInner>() { }.getType())
                 .registerError(QueryFailureException.class)
@@ -2810,74 +3230,105 @@ private ServiceResponse<SummarizeResultsInner> summarizeForSubscriptionLevelPoli
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResourceGroupLevelPolicyAssignment(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForSubscriptionLevelPolicyAssignment(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        if (policyStatesResource == null) {
-            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
-        }
-        if (subscriptionId == null) {
-            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName) {
+        if (policyStatesResource == null) {
+            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
         if (policyAssignmentName == null) {
             throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
@@ -2892,13 +3343,14 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         DateTime to = null;
         String filter = null;
         String apply = null;
-        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyStatesResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyStatesResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -2907,79 +3359,111 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the PolicyStatesQueryResultsInner object if successful.
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
      */
-    public PolicyStatesQueryResultsInner listQueryResultsForResourceGroupLevelPolicyAssignment(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public PagedList<PolicyStateInner> listQueryResultsForSubscriptionLevelPolicyAssignment(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<PolicyStatesQueryResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
      */
-    public Observable<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<PolicyStatesQueryResultsInner>, PolicyStatesQueryResultsInner>() {
-            @Override
-            public PolicyStatesQueryResultsInner call(ServiceResponse<PolicyStatesQueryResultsInner> response) {
-                return response.body();
-            }
-        });
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
     }
 
     /**
-     * Queries policy states for the resource group level policy assignment.
+     * Queries policy states for the subscription level policy assignment.
      *
      * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the PolicyStatesQueryResultsInner object
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, policyAssignmentName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyAssignmentName Policy assignment name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
      */
-    public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(PolicyStatesResource policyStatesResource, String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String policyAssignmentName, final QueryOptions queryOptions) {
         if (policyStatesResource == null) {
             throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
         }
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
         if (policyAssignmentName == null) {
             throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
         }
@@ -3014,13 +3498,17 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> listQueryResul
         if (queryOptions != null) {
             apply = queryOptions.apply();
         }
-        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyStatesResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<PolicyStatesQueryResultsInner>>>() {
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignment(policyStatesResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
                 @Override
-                public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<PolicyStatesQueryResultsInner> clientResponse = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
-                        return Observable.just(clientResponse);
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
                     } catch (Throwable t) {
                         return Observable.error(t);
                     }
@@ -3028,53 +3516,50 @@ public Observable<ServiceResponse<PolicyStatesQueryResultsInner>> call(Response<
             });
     }
 
-    private ServiceResponse<PolicyStatesQueryResultsInner> listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<PolicyStatesQueryResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<PolicyStatesQueryResultsInner>() { }.getType())
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws QueryFailureException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName) {
+        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
-        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName) {
+        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -3083,21 +3568,17 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
         if (policyAssignmentName == null) {
             throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
         }
@@ -3109,12 +3590,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGr
         DateTime from = null;
         DateTime to = null;
         String filter = null;
-        return service.summarizeForResourceGroupLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForSubscriptionLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForSubscriptionLevelPolicyAssignmentDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -3124,10 +3605,9 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -3135,37 +3615,35 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the SummarizeResultsInner object if successful.
      */
-    public SummarizeResultsInner summarizeForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single().body();
+    public SummarizeResultsInner summarizeForSubscriptionLevelPolicyAssignment(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
+        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).toBlocking().single().body();
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
-        return ServiceFuture.fromResponse(summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions), serviceCallback);
+    public ServiceFuture<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions), serviceCallback);
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
-        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+    public Observable<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
+        return summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
             @Override
             public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
                 return response.body();
@@ -3174,22 +3652,18 @@ public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> respons
     }
 
     /**
-     * Summarizes policy states for the resource group level policy assignment.
+     * Summarizes policy states for the subscription level policy assignment.
      *
      * @param subscriptionId Microsoft Azure subscription ID.
-     * @param resourceGroupName Resource group name.
      * @param policyAssignmentName Policy assignment name.
      * @param queryOptions Additional parameters for the operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the SummarizeResultsInner object
      */
-    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForSubscriptionLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String policyAssignmentName, QueryOptions queryOptions) {
         if (subscriptionId == null) {
             throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
         }
-        if (resourceGroupName == null) {
-            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
-        }
         if (policyAssignmentName == null) {
             throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
         }
@@ -3213,12 +3687,12 @@ public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGr
         if (queryOptions != null) {
             filter = queryOptions.filter();
         }
-        return service.summarizeForResourceGroupLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+        return service.summarizeForSubscriptionLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
                 @Override
                 public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForSubscriptionLevelPolicyAssignmentDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -3227,11 +3701,1408 @@ public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<Response
             });
     }
 
-    private ServiceResponse<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+    private ServiceResponse<SummarizeResultsInner> summarizeForSubscriptionLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<SummarizeResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<SummarizeResultsInner>() { }.getType())
                 .registerError(QueryFailureException.class)
                 .build(response);
     }
 
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroupLevelPolicyAssignment(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName) {
+        if (policyStatesResource == null) {
+            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
+        }
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        }
+        final String authorizationNamespace = "Microsoft.Authorization";
+        final String apiVersion = "2019-10-01";
+        final QueryOptions queryOptions = null;
+        Integer top = null;
+        String orderBy = null;
+        String select = null;
+        DateTime from = null;
+        DateTime to = null;
+        String filter = null;
+        String apply = null;
+        String skipToken = null;
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyStatesResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroupLevelPolicyAssignment(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(policyStatesResource, subscriptionId, resourceGroupName, policyAssignmentName, queryOptions)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyStatesResource The virtual resource under PolicyStates resource type. In a given time range, 'latest' represents the latest policy state(s), whereas 'default' represents all policy state(s). Possible values include: 'default', 'latest'
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param subscriptionId Microsoft Azure subscription ID.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param resourceGroupName Resource group name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param policyAssignmentName Policy assignment name.
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentSinglePageAsync(final PolicyStatesResource policyStatesResource, final String subscriptionId, final String resourceGroupName, final String policyAssignmentName, final QueryOptions queryOptions) {
+        if (policyStatesResource == null) {
+            throw new IllegalArgumentException("Parameter policyStatesResource is required and cannot be null.");
+        }
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        }
+        Validator.validate(queryOptions);
+        final String authorizationNamespace = "Microsoft.Authorization";
+        final String apiVersion = "2019-10-01";
+        Integer top = null;
+        if (queryOptions != null) {
+            top = queryOptions.top();
+        }
+        String orderBy = null;
+        if (queryOptions != null) {
+            orderBy = queryOptions.orderBy();
+        }
+        String select = null;
+        if (queryOptions != null) {
+            select = queryOptions.select();
+        }
+        DateTime from = null;
+        if (queryOptions != null) {
+            from = queryOptions.from();
+        }
+        DateTime to = null;
+        if (queryOptions != null) {
+            to = queryOptions.to();
+        }
+        String filter = null;
+        if (queryOptions != null) {
+            filter = queryOptions.filter();
+        }
+        String apply = null;
+        if (queryOptions != null) {
+            apply = queryOptions.apply();
+        }
+        String skipToken = null;
+        if (queryOptions != null) {
+            skipToken = queryOptions.skipToken();
+        }
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignment(policyStatesResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, orderBy, select, from, to, filter, apply, skipToken, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SummarizeResultsInner object if successful.
+     */
+    public SummarizeResultsInner summarizeForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).toBlocking().single().body();
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName), serviceCallback);
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SummarizeResultsInner object
+     */
+    public Observable<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+            @Override
+            public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SummarizeResultsInner object
+     */
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        }
+        final String policyStatesSummaryResource = "latest";
+        final String authorizationNamespace = "Microsoft.Authorization";
+        final String apiVersion = "2019-10-01";
+        final QueryOptions queryOptions = null;
+        Integer top = null;
+        DateTime from = null;
+        DateTime to = null;
+        String filter = null;
+        return service.summarizeForResourceGroupLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the SummarizeResultsInner object if successful.
+     */
+    public SummarizeResultsInner summarizeForResourceGroupLevelPolicyAssignment(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).toBlocking().single().body();
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions, final ServiceCallback<SummarizeResultsInner> serviceCallback) {
+        return ServiceFuture.fromResponse(summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions), serviceCallback);
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SummarizeResultsInner object
+     */
+    public Observable<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+        return summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(subscriptionId, resourceGroupName, policyAssignmentName, queryOptions).map(new Func1<ServiceResponse<SummarizeResultsInner>, SummarizeResultsInner>() {
+            @Override
+            public SummarizeResultsInner call(ServiceResponse<SummarizeResultsInner> response) {
+                return response.body();
+            }
+        });
+    }
+
+    /**
+     * Summarizes policy states for the resource group level policy assignment.
+     *
+     * @param subscriptionId Microsoft Azure subscription ID.
+     * @param resourceGroupName Resource group name.
+     * @param policyAssignmentName Policy assignment name.
+     * @param queryOptions Additional parameters for the operation
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the SummarizeResultsInner object
+     */
+    public Observable<ServiceResponse<SummarizeResultsInner>> summarizeForResourceGroupLevelPolicyAssignmentWithServiceResponseAsync(String subscriptionId, String resourceGroupName, String policyAssignmentName, QueryOptions queryOptions) {
+        if (subscriptionId == null) {
+            throw new IllegalArgumentException("Parameter subscriptionId is required and cannot be null.");
+        }
+        if (resourceGroupName == null) {
+            throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
+        }
+        if (policyAssignmentName == null) {
+            throw new IllegalArgumentException("Parameter policyAssignmentName is required and cannot be null.");
+        }
+        Validator.validate(queryOptions);
+        final String policyStatesSummaryResource = "latest";
+        final String authorizationNamespace = "Microsoft.Authorization";
+        final String apiVersion = "2019-10-01";
+        Integer top = null;
+        if (queryOptions != null) {
+            top = queryOptions.top();
+        }
+        DateTime from = null;
+        if (queryOptions != null) {
+            from = queryOptions.from();
+        }
+        DateTime to = null;
+        if (queryOptions != null) {
+            to = queryOptions.to();
+        }
+        String filter = null;
+        if (queryOptions != null) {
+            filter = queryOptions.filter();
+        }
+        return service.summarizeForResourceGroupLevelPolicyAssignment(policyStatesSummaryResource, subscriptionId, resourceGroupName, authorizationNamespace, policyAssignmentName, apiVersion, this.client.acceptLanguage(), top, from, to, filter, this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SummarizeResultsInner>>>() {
+                @Override
+                public Observable<ServiceResponse<SummarizeResultsInner>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<SummarizeResultsInner> clientResponse = summarizeForResourceGroupLevelPolicyAssignmentDelegate(response);
+                        return Observable.just(clientResponse);
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<SummarizeResultsInner> summarizeForResourceGroupLevelPolicyAssignmentDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<SummarizeResultsInner, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<SummarizeResultsInner>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForManagementGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForManagementGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForManagementGroupNextAsync(final String nextPageLink) {
+        return listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForManagementGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForManagementGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the management group.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForManagementGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForManagementGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForManagementGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForManagementGroupNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForSubscriptionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionNextAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the subscription.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForSubscriptionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForSubscriptionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroupNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resources under the resource group.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceGroupNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceGroupNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForResourceNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForPolicySetDefinitionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicySetDefinitionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicySetDefinitionNextAsync(final String nextPageLink) {
+        return listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForPolicySetDefinitionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicySetDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy set definition.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicySetDefinitionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForPolicySetDefinitionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicySetDefinitionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForPolicySetDefinitionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForPolicyDefinitionNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForPolicyDefinitionNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForPolicyDefinitionNextAsync(final String nextPageLink) {
+        return listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForPolicyDefinitionNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForPolicyDefinitionNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy definition.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForPolicyDefinitionNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForPolicyDefinitionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForPolicyDefinitionNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForPolicyDefinitionNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForSubscriptionLevelPolicyAssignmentNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForSubscriptionLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the subscription level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForSubscriptionLevelPolicyAssignmentNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForSubscriptionLevelPolicyAssignmentNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForSubscriptionLevelPolicyAssignmentNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @throws QueryFailureException thrown if the request is rejected by server
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+     * @return the PagedList&lt;PolicyStateInner&gt; object if successful.
+     */
+    public PagedList<PolicyStateInner> listQueryResultsForResourceGroupLevelPolicyAssignmentNext(final String nextPageLink) {
+        ServiceResponse<Page<PolicyStateInner>> response = listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single();
+        return new PagedList<PolicyStateInner>(response.body()) {
+            @Override
+            public Page<PolicyStateInner> nextPage(String nextPageLink) {
+                return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink).toBlocking().single().body();
+            }
+        };
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @param serviceFuture the ServiceFuture object tracking the Retrofit calls
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the {@link ServiceFuture} object
+     */
+    public ServiceFuture<List<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextAsync(final String nextPageLink, final ServiceFuture<List<PolicyStateInner>> serviceFuture, final ListOperationCallback<PolicyStateInner> serviceCallback) {
+        return AzureServiceFuture.fromPageResponse(
+            listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink),
+            new Func1<String, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(String nextPageLink) {
+                    return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink);
+                }
+            },
+            serviceCallback);
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<Page<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink)
+            .map(new Func1<ServiceResponse<Page<PolicyStateInner>>, Page<PolicyStateInner>>() {
+                @Override
+                public Page<PolicyStateInner> call(ServiceResponse<Page<PolicyStateInner>> response) {
+                    return response.body();
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+     * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable to the PagedList&lt;PolicyStateInner&gt; object
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(final String nextPageLink) {
+        return listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(nextPageLink)
+            .concatMap(new Func1<ServiceResponse<Page<PolicyStateInner>>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(ServiceResponse<Page<PolicyStateInner>> page) {
+                    String nextPageLink = page.body().nextPageLink();
+                    if (nextPageLink == null) {
+                        return Observable.just(page);
+                    }
+                    return Observable.just(page).concatWith(listQueryResultsForResourceGroupLevelPolicyAssignmentNextWithServiceResponseAsync(nextPageLink));
+                }
+            });
+    }
+
+    /**
+     * Queries policy states for the resource group level policy assignment.
+     *
+    ServiceResponse<PageImpl1<PolicyStateInner>> * @param nextPageLink The NextLink from the previous successful call to List operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the PagedList&lt;PolicyStateInner&gt; object wrapped in {@link ServiceResponse} if successful.
+     */
+    public Observable<ServiceResponse<Page<PolicyStateInner>>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextSinglePageAsync(final String nextPageLink) {
+        if (nextPageLink == null) {
+            throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null.");
+        }
+        String nextUrl = String.format("%s", nextPageLink);
+        return service.listQueryResultsForResourceGroupLevelPolicyAssignmentNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent())
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Page<PolicyStateInner>>>>() {
+                @Override
+                public Observable<ServiceResponse<Page<PolicyStateInner>>> call(Response<ResponseBody> response) {
+                    try {
+                        ServiceResponse<PageImpl1<PolicyStateInner>> result = listQueryResultsForResourceGroupLevelPolicyAssignmentNextDelegate(response);
+                        return Observable.just(new ServiceResponse<Page<PolicyStateInner>>(result.body(), result.response()));
+                    } catch (Throwable t) {
+                        return Observable.error(t);
+                    }
+                }
+            });
+    }
+
+    private ServiceResponse<PageImpl1<PolicyStateInner>> listQueryResultsForResourceGroupLevelPolicyAssignmentNextDelegate(Response<ResponseBody> response) throws QueryFailureException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<PageImpl1<PolicyStateInner>, QueryFailureException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<PageImpl1<PolicyStateInner>>() { }.getType())
+                .registerError(QueryFailureException.class)
+                .build(response);
+    }
+
 }
diff --git a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/RemediationImpl.java b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/RemediationImpl.java
index 396ef9972bc6..344735d7ea61 100644
--- a/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/RemediationImpl.java
+++ b/sdk/policyinsights/mgmt-v2019_10_01/src/main/java/com/microsoft/azure/management/policyinsights/v2019_10_01/implementation/RemediationImpl.java
@@ -127,7 +127,7 @@ public String type() {
     }
 
     @Override
-    public RemediationImpl withExistingManagementGroupId(String managementGroupId) {
+    public RemediationImpl withExistingMicrosoft.PolicyInsight(String managementGroupId) {
         this.managementGroupId = managementGroupId;
         return this;
     }