diff --git a/src/SDKs/PolicyInsights/Management/AzSdk.RP.props b/src/SDKs/PolicyInsights/Management/AzSdk.RP.props
index 3c9120d868ccc..6e14835334df4 100644
--- a/src/SDKs/PolicyInsights/Management/AzSdk.RP.props
+++ b/src/SDKs/PolicyInsights/Management/AzSdk.RP.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>PolicyInsights_2018-04-04;PolicyInsights_2018-07-01-preview;</AzureApiTag>
+    <AzureApiTag>PolicyInsights_2018-07-01-preview;PolicyInsights_2018-04-04;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/ExpressionEvaluationDetails.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/ExpressionEvaluationDetails.cs
new file mode 100644
index 0000000000000..bfcee28fd06fe
--- /dev/null
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/ExpressionEvaluationDetails.cs
@@ -0,0 +1,98 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.PolicyInsights.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Evaluation details of policy language expressions.
+    /// </summary>
+    public partial class ExpressionEvaluationDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the ExpressionEvaluationDetails
+        /// class.
+        /// </summary>
+        public ExpressionEvaluationDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ExpressionEvaluationDetails
+        /// class.
+        /// </summary>
+        /// <param name="result">Evaluation result.</param>
+        /// <param name="expression">Expression evaluated.</param>
+        /// <param name="path">Property path if the expression is a field or an
+        /// alias.</param>
+        /// <param name="expressionValue">Value of the expression.</param>
+        /// <param name="targetValue">Target value to be compared with the
+        /// expression value.</param>
+        /// <param name="operatorProperty">Operator to compare the expression
+        /// value and the target value.</param>
+        public ExpressionEvaluationDetails(string result = default(string), string expression = default(string), string path = default(string), object expressionValue = default(object), object targetValue = default(object), string operatorProperty = default(string))
+        {
+            Result = result;
+            Expression = expression;
+            Path = path;
+            ExpressionValue = expressionValue;
+            TargetValue = targetValue;
+            OperatorProperty = operatorProperty;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets evaluation result.
+        /// </summary>
+        [JsonProperty(PropertyName = "result")]
+        public string Result { get; set; }
+
+        /// <summary>
+        /// Gets or sets expression evaluated.
+        /// </summary>
+        [JsonProperty(PropertyName = "expression")]
+        public string Expression { get; set; }
+
+        /// <summary>
+        /// Gets or sets property path if the expression is a field or an
+        /// alias.
+        /// </summary>
+        [JsonProperty(PropertyName = "path")]
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Gets or sets value of the expression.
+        /// </summary>
+        [JsonProperty(PropertyName = "expressionValue")]
+        public object ExpressionValue { get; set; }
+
+        /// <summary>
+        /// Gets or sets target value to be compared with the expression value.
+        /// </summary>
+        [JsonProperty(PropertyName = "targetValue")]
+        public object TargetValue { get; set; }
+
+        /// <summary>
+        /// Gets or sets operator to compare the expression value and the
+        /// target value.
+        /// </summary>
+        [JsonProperty(PropertyName = "operator")]
+        public string OperatorProperty { get; set; }
+
+    }
+}
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/IfNotExistsEvaluationDetails.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/IfNotExistsEvaluationDetails.cs
new file mode 100644
index 0000000000000..734fde0daaf6f
--- /dev/null
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/IfNotExistsEvaluationDetails.cs
@@ -0,0 +1,65 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.PolicyInsights.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Evaluation details of IfNotExists effect.
+    /// </summary>
+    public partial class IfNotExistsEvaluationDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the IfNotExistsEvaluationDetails
+        /// class.
+        /// </summary>
+        public IfNotExistsEvaluationDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the IfNotExistsEvaluationDetails
+        /// class.
+        /// </summary>
+        /// <param name="resourceId">ID of the last evaluated resource for
+        /// IfNotExists effect.</param>
+        /// <param name="totalResources">Total number of resources to which the
+        /// existence condition is applicable.</param>
+        public IfNotExistsEvaluationDetails(string resourceId = default(string), int? totalResources = default(int?))
+        {
+            ResourceId = resourceId;
+            TotalResources = totalResources;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets ID of the last evaluated resource for IfNotExists
+        /// effect.
+        /// </summary>
+        [JsonProperty(PropertyName = "resourceId")]
+        public string ResourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets total number of resources to which the existence
+        /// condition is applicable.
+        /// </summary>
+        [JsonProperty(PropertyName = "totalResources")]
+        public int? TotalResources { get; set; }
+
+    }
+}
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvaluationDetails.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvaluationDetails.cs
new file mode 100644
index 0000000000000..b8b796c5aa2d9
--- /dev/null
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvaluationDetails.cs
@@ -0,0 +1,63 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.PolicyInsights.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Policy evaluation details.
+    /// </summary>
+    public partial class PolicyEvaluationDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the PolicyEvaluationDetails class.
+        /// </summary>
+        public PolicyEvaluationDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PolicyEvaluationDetails class.
+        /// </summary>
+        /// <param name="evaluatedExpressions">Details of the evaluated
+        /// expressions.</param>
+        /// <param name="ifNotExistsDetails">Evaluation details of IfNotExists
+        /// effect.</param>
+        public PolicyEvaluationDetails(IList<ExpressionEvaluationDetails> evaluatedExpressions = default(IList<ExpressionEvaluationDetails>), IfNotExistsEvaluationDetails ifNotExistsDetails = default(IfNotExistsEvaluationDetails))
+        {
+            EvaluatedExpressions = evaluatedExpressions;
+            IfNotExistsDetails = ifNotExistsDetails;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets details of the evaluated expressions.
+        /// </summary>
+        [JsonProperty(PropertyName = "evaluatedExpressions")]
+        public IList<ExpressionEvaluationDetails> EvaluatedExpressions { get; set; }
+
+        /// <summary>
+        /// Gets or sets evaluation details of IfNotExists effect.
+        /// </summary>
+        [JsonProperty(PropertyName = "ifNotExistsDetails")]
+        public IfNotExistsEvaluationDetails IfNotExistsDetails { get; set; }
+
+    }
+}
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvent.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvent.cs
index 17e08951ae739..69b14afdfd227 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvent.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyEvent.cs
@@ -74,7 +74,7 @@ public PolicyEvent()
         /// category, if the policy assignment is for a policy set.</param>
         /// <param name="policySetDefinitionParameters">Policy set definition
         /// parameters, if the policy assignment is for a policy set.</param>
-        /// <param name="managementGroupIds">Comma seperated list of management
+        /// <param name="managementGroupIds">Comma separated list of management
         /// group IDs, which represent the hierarchy of the management groups
         /// the resource is under.</param>
         /// <param name="policyDefinitionReferenceId">Reference ID for the
@@ -291,7 +291,7 @@ public PolicyEvent()
         public string PolicySetDefinitionParameters { get; set; }
 
         /// <summary>
-        /// Gets or sets comma seperated list of management group IDs, which
+        /// Gets or sets comma separated list of management group IDs, which
         /// represent the hierarchy of the management groups the resource is
         /// under.
         /// </summary>
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyState.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyState.cs
index 5cb9a5a8f85c4..9b7cedf352626 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyState.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/PolicyState.cs
@@ -74,13 +74,17 @@ public PolicyState()
         /// category, if the policy assignment is for a policy set.</param>
         /// <param name="policySetDefinitionParameters">Policy set definition
         /// parameters, if the policy assignment is for a policy set.</param>
-        /// <param name="managementGroupIds">Comma seperated list of management
+        /// <param name="managementGroupIds">Comma separated list of management
         /// group IDs, which represent the hierarchy of the management groups
         /// the resource is under.</param>
         /// <param name="policyDefinitionReferenceId">Reference ID for the
         /// policy definition inside the policy set, if the policy assignment
         /// is for a policy set.</param>
-        public PolicyState(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string odataid = default(string), string odatacontext = default(string), System.DateTime? timestamp = default(System.DateTime?), string resourceId = default(string), string policyAssignmentId = default(string), string policyDefinitionId = default(string), string effectiveParameters = default(string), bool? isCompliant = default(bool?), string subscriptionId = default(string), string resourceType = default(string), string resourceLocation = default(string), string resourceGroup = default(string), string resourceTags = default(string), string policyAssignmentName = default(string), string policyAssignmentOwner = default(string), string policyAssignmentParameters = default(string), string policyAssignmentScope = default(string), string policyDefinitionName = default(string), string policyDefinitionAction = default(string), string policyDefinitionCategory = default(string), string policySetDefinitionId = default(string), string policySetDefinitionName = default(string), string policySetDefinitionOwner = default(string), string policySetDefinitionCategory = default(string), string policySetDefinitionParameters = default(string), string managementGroupIds = default(string), string policyDefinitionReferenceId = default(string))
+        /// <param name="complianceState">Compliance state of the
+        /// resource.</param>
+        /// <param name="policyEvaluationDetails">Policy evaluation
+        /// details.</param>
+        public PolicyState(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), string odataid = default(string), string odatacontext = default(string), System.DateTime? timestamp = default(System.DateTime?), string resourceId = default(string), string policyAssignmentId = default(string), string policyDefinitionId = default(string), string effectiveParameters = default(string), bool? isCompliant = default(bool?), string subscriptionId = default(string), string resourceType = default(string), string resourceLocation = default(string), string resourceGroup = default(string), string resourceTags = default(string), string policyAssignmentName = default(string), string policyAssignmentOwner = default(string), string policyAssignmentParameters = default(string), string policyAssignmentScope = default(string), string policyDefinitionName = default(string), string policyDefinitionAction = default(string), string policyDefinitionCategory = default(string), string policySetDefinitionId = default(string), string policySetDefinitionName = default(string), string policySetDefinitionOwner = default(string), string policySetDefinitionCategory = default(string), string policySetDefinitionParameters = default(string), string managementGroupIds = default(string), string policyDefinitionReferenceId = default(string), string complianceState = default(string), PolicyEvaluationDetails policyEvaluationDetails = default(PolicyEvaluationDetails))
         {
             AdditionalProperties = additionalProperties;
             Odataid = odataid;
@@ -110,6 +114,8 @@ public PolicyState()
             PolicySetDefinitionParameters = policySetDefinitionParameters;
             ManagementGroupIds = managementGroupIds;
             PolicyDefinitionReferenceId = policyDefinitionReferenceId;
+            ComplianceState = complianceState;
+            PolicyEvaluationDetails = policyEvaluationDetails;
             CustomInit();
         }
 
@@ -284,7 +290,7 @@ public PolicyState()
         public string PolicySetDefinitionParameters { get; set; }
 
         /// <summary>
-        /// Gets or sets comma seperated list of management group IDs, which
+        /// Gets or sets comma separated list of management group IDs, which
         /// represent the hierarchy of the management groups the resource is
         /// under.
         /// </summary>
@@ -298,5 +304,17 @@ public PolicyState()
         [JsonProperty(PropertyName = "policyDefinitionReferenceId")]
         public string PolicyDefinitionReferenceId { get; set; }
 
+        /// <summary>
+        /// Gets or sets compliance state of the resource.
+        /// </summary>
+        [JsonProperty(PropertyName = "complianceState")]
+        public string ComplianceState { get; set; }
+
+        /// <summary>
+        /// Gets or sets policy evaluation details.
+        /// </summary>
+        [JsonProperty(PropertyName = "policyEvaluationDetails")]
+        public PolicyEvaluationDetails PolicyEvaluationDetails { get; set; }
+
     }
 }
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/QueryOptions.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/QueryOptions.cs
index 019228868ab9b..0ecdae47c4f42 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/QueryOptions.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/QueryOptions.cs
@@ -46,7 +46,10 @@ public QueryOptions()
         /// request time.</param>
         /// <param name="apply">OData apply expression for
         /// aggregations.</param>
-        public QueryOptions(int? top = default(int?), string filter = default(string), string orderBy = default(string), string select = default(string), System.DateTime? fromProperty = default(System.DateTime?), System.DateTime? to = default(System.DateTime?), string apply = default(string))
+        /// <param name="expand">The $expand query parameter. For example, to
+        /// expand policyEvaluationDetails, use
+        /// $expand=policyEvaluationDetails</param>
+        public QueryOptions(int? top = default(int?), string filter = default(string), string orderBy = default(string), string select = default(string), System.DateTime? fromProperty = default(System.DateTime?), System.DateTime? to = default(System.DateTime?), string apply = default(string), string expand = default(string))
         {
             Top = top;
             Filter = filter;
@@ -55,6 +58,7 @@ public QueryOptions()
             FromProperty = fromProperty;
             To = to;
             Apply = apply;
+            Expand = expand;
             CustomInit();
         }
 
@@ -113,5 +117,12 @@ public QueryOptions()
         [Newtonsoft.Json.JsonIgnore]
         public string Apply { get; set; }
 
+        /// <summary>
+        /// Gets or sets the $expand query parameter. For example, to expand
+        /// policyEvaluationDetails, use $expand=policyEvaluationDetails
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public string Expand { get; set; }
+
     }
 }
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/Remediation.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/Remediation.cs
index 6955fb12f191b..b97c66258393b 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/Remediation.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/Remediation.cs
@@ -48,7 +48,7 @@ public Remediation()
         /// <param name="filters">The filters that will be applied to determine
         /// which resources to remediate.</param>
         /// <param name="deploymentStatus">The deployment status summary for
-        /// all deplyoments created by the remediation.</param>
+        /// all deployments created by the remediation.</param>
         /// <param name="id">The ID of the remediation.</param>
         /// <param name="type">The type of the remediation.</param>
         /// <param name="name">The name of the remediation.</param>
@@ -113,7 +113,7 @@ public Remediation()
         public RemediationFilters Filters { get; set; }
 
         /// <summary>
-        /// Gets or sets the deployment status summary for all deplyoments
+        /// Gets or sets the deployment status summary for all deployments
         /// created by the remediation.
         /// </summary>
         [JsonProperty(PropertyName = "properties.deploymentStatus")]
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/RemediationDeploymentSummary.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/RemediationDeploymentSummary.cs
index 0056cf44c73f7..88d5c77c93f70 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/RemediationDeploymentSummary.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Models/RemediationDeploymentSummary.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.PolicyInsights.Models
     using System.Linq;
 
     /// <summary>
-    /// The deployment status summary for all deplyoments created by the
+    /// The deployment status summary for all deployments created by the
     /// remediation.
     /// </summary>
     public partial class RemediationDeploymentSummary
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Operations.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Operations.cs
index 4f3938fe27a8a..0b6f852d9248f 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Operations.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/Operations.cs
@@ -70,7 +70,7 @@ internal Operations(PolicyInsightsClient client)
         /// </return>
         public async Task<AzureOperationResponse<OperationsListResults>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/PolicyStatesOperations.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/PolicyStatesOperations.cs
index 9e98ad5c45d94..01f940f65da3b 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/PolicyStatesOperations.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/PolicyStatesOperations.cs
@@ -97,7 +97,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "managementGroupName");
             }
             string managementGroupsNamespace = "Microsoft.Management";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -351,7 +351,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             }
             string policyStatesSummaryResource = "latest";
             string managementGroupsNamespace = "Microsoft.Management";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -583,7 +583,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "subscriptionId");
             }
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -834,7 +834,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "subscriptionId");
             }
             string policyStatesSummaryResource = "latest";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -1071,7 +1071,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
             }
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -1331,7 +1331,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
             }
             string policyStatesSummaryResource = "latest";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -1563,7 +1563,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "resourceId");
             }
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -1599,6 +1599,11 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 apply = queryOptions.Apply;
             }
+            string expand = default(string);
+            if (queryOptions != null)
+            {
+                expand = queryOptions.Expand;
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1616,6 +1621,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 tracingParameters.Add("to", to);
                 tracingParameters.Add("filter", filter);
                 tracingParameters.Add("apply", apply);
+                tracingParameters.Add("expand", expand);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListQueryResultsForResource", tracingParameters);
             }
@@ -1657,6 +1663,10 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 _queryParameters.Add(string.Format("$apply={0}", System.Uri.EscapeDataString(apply)));
             }
+            if (expand != null)
+            {
+                _queryParameters.Add(string.Format("$expand={0}", System.Uri.EscapeDataString(expand)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -1814,7 +1824,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "resourceId");
             }
             string policyStatesSummaryResource = "latest";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -2052,7 +2062,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "policySetDefinitionName");
             }
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -2315,7 +2325,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             }
             string policyStatesSummaryResource = "latest";
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -2557,7 +2567,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "policyDefinitionName");
             }
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -2820,7 +2830,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             }
             string policyStatesSummaryResource = "latest";
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -3062,7 +3072,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "policyAssignmentName");
             }
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -3325,7 +3335,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             }
             string policyStatesSummaryResource = "latest";
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -3574,7 +3584,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
                 throw new ValidationException(ValidationRules.CannotBeNull, "policyAssignmentName");
             }
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -3846,7 +3856,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             }
             string policyStatesSummaryResource = "latest";
             string authorizationNamespace = "Microsoft.Authorization";
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             int? top = default(int?);
             if (queryOptions != null)
             {
@@ -4070,7 +4080,7 @@ internal PolicyStatesOperations(PolicyInsightsClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "scope");
             }
-            string apiVersion = "2018-04-04";
+            string apiVersion = "2018-07-01-preview";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/SdkInfo_PolicyInsightsClient.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/SdkInfo_PolicyInsightsClient.cs
index f2f7c4bf36464..43c7d3016a67f 100644
--- a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/SdkInfo_PolicyInsightsClient.cs
+++ b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Generated/SdkInfo_PolicyInsightsClient.cs
@@ -19,24 +19,13 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_PolicyInsightsC
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("PolicyInsights", "Operations", "2018-04-04"),
+                new Tuple<string, string, string>("PolicyInsights", "Operations", "2018-07-01-preview"),
                 new Tuple<string, string, string>("PolicyInsights", "PolicyEvents", "2018-04-04"),
-                new Tuple<string, string, string>("PolicyInsights", "PolicyStates", "2018-04-04"),
+                new Tuple<string, string, string>("PolicyInsights", "PolicyStates", "2018-07-01-preview"),
                 new Tuple<string, string, string>("PolicyInsights", "PolicyTrackedResources", "2018-07-01-preview"),
                 new Tuple<string, string, string>("PolicyInsights", "Remediations", "2018-07-01-preview"),
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/policyinsights/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\code\\azure-sdk-for-net\\src\\SDKs";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "64266364a9517d82448d09622b70ff753a9fbaa9";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-