diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/AdvisorManagementClient.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/AdvisorManagementClient.cs
index 9aed0ac6744d1..a876c70d6f407 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/AdvisorManagementClient.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/AdvisorManagementClient.cs
@@ -346,7 +346,7 @@ private void Initialize()
             Operations = new Operations(this);
             Suppressions = new SuppressionsOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2017-04-19";
+            ApiVersion = "2020-01-01";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperations.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperations.cs
index b7f5c75264796..ab439f853f380 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperations.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperations.cs
@@ -63,7 +63,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -167,14 +167,13 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ArmErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ArmErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ArmErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -184,10 +183,6 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -248,7 +243,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -263,7 +258,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ARMErrorResponseBody>> CreateInSubscriptionWithHttpMessagesAsync(ConfigData configContract, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ConfigData>> CreateInSubscriptionWithHttpMessagesAsync(ConfigData configContract, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -277,6 +272,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
+            string configurationName = "default";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -285,13 +281,15 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("configContract", configContract);
+                tracingParameters.Add("configurationName", configurationName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateInSubscription", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Advisor/configurations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Advisor/configurations/{configurationName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            _url = _url.Replace("{configurationName}", System.Uri.EscapeDataString(configurationName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -361,16 +359,15 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204 && (int)_statusCode != 400)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ArmErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ArmErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ArmErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -380,10 +377,6 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -396,7 +389,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ARMErrorResponseBody>();
+            var _result = new AzureOperationResponse<ConfigData>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -404,12 +397,12 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 400)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ARMErrorResponseBody>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConfigData>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -440,7 +433,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -550,14 +543,13 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ArmErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ArmErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ArmErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -567,10 +559,6 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -630,7 +618,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -645,7 +633,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ARMErrorResponseBody>> CreateInResourceGroupWithHttpMessagesAsync(ConfigData configContract, string resourceGroup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ConfigData>> CreateInResourceGroupWithHttpMessagesAsync(ConfigData configContract, string resourceGroup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -663,6 +651,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroup");
             }
+            string configurationName = "default";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -671,14 +660,16 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("configContract", configContract);
+                tracingParameters.Add("configurationName", configurationName);
                 tracingParameters.Add("resourceGroup", resourceGroup);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateInResourceGroup", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Advisor/configurations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Advisor/configurations/{configurationName}").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            _url = _url.Replace("{configurationName}", System.Uri.EscapeDataString(configurationName));
             _url = _url.Replace("{resourceGroup}", System.Uri.EscapeDataString(resourceGroup));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -749,16 +740,15 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204 && (int)_statusCode != 400)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ArmErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ArmErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ArmErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -768,10 +758,6 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -784,7 +770,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ARMErrorResponseBody>();
+            var _result = new AzureOperationResponse<ConfigData>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -792,12 +778,12 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 400)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ARMErrorResponseBody>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConfigData>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -832,7 +818,7 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -928,14 +914,13 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new ArmErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
+                    ArmErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ArmErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -945,10 +930,6 @@ internal ConfigurationsOperations(AdvisorManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
-                {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-                }
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperationsExtensions.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperationsExtensions.cs
index bcdd4405c3ed5..22e643f4335b7 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperationsExtensions.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/ConfigurationsOperationsExtensions.cs
@@ -72,7 +72,7 @@ public static IPage<ConfigData> ListBySubscription(this IConfigurationsOperation
             /// <param name='configContract'>
             /// The Azure Advisor configuration data structure.
             /// </param>
-            public static ARMErrorResponseBody CreateInSubscription(this IConfigurationsOperations operations, ConfigData configContract)
+            public static ConfigData CreateInSubscription(this IConfigurationsOperations operations, ConfigData configContract)
             {
                 return operations.CreateInSubscriptionAsync(configContract).GetAwaiter().GetResult();
             }
@@ -93,7 +93,7 @@ public static ARMErrorResponseBody CreateInSubscription(this IConfigurationsOper
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ARMErrorResponseBody> CreateInSubscriptionAsync(this IConfigurationsOperations operations, ConfigData configContract, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ConfigData> CreateInSubscriptionAsync(this IConfigurationsOperations operations, ConfigData configContract, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.CreateInSubscriptionWithHttpMessagesAsync(configContract, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -147,7 +147,7 @@ public static IEnumerable<ConfigData> ListByResourceGroup(this IConfigurationsOp
             /// <param name='resourceGroup'>
             /// The name of the Azure resource group.
             /// </param>
-            public static ARMErrorResponseBody CreateInResourceGroup(this IConfigurationsOperations operations, ConfigData configContract, string resourceGroup)
+            public static ConfigData CreateInResourceGroup(this IConfigurationsOperations operations, ConfigData configContract, string resourceGroup)
             {
                 return operations.CreateInResourceGroupAsync(configContract, resourceGroup).GetAwaiter().GetResult();
             }
@@ -167,7 +167,7 @@ public static ARMErrorResponseBody CreateInResourceGroup(this IConfigurationsOpe
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ARMErrorResponseBody> CreateInResourceGroupAsync(this IConfigurationsOperations operations, ConfigData configContract, string resourceGroup, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ConfigData> CreateInResourceGroupAsync(this IConfigurationsOperations operations, ConfigData configContract, string resourceGroup, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.CreateInResourceGroupWithHttpMessagesAsync(configContract, resourceGroup, null, cancellationToken).ConfigureAwait(false))
                 {
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/IConfigurationsOperations.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/IConfigurationsOperations.cs
index 8b820eb79e4b0..d19e72b650584 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/IConfigurationsOperations.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/IConfigurationsOperations.cs
@@ -36,7 +36,7 @@ public partial interface IConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -62,7 +62,7 @@ public partial interface IConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -71,7 +71,7 @@ public partial interface IConfigurationsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ARMErrorResponseBody>> CreateInSubscriptionWithHttpMessagesAsync(ConfigData configContract, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ConfigData>> CreateInSubscriptionWithHttpMessagesAsync(ConfigData configContract, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Retrieve Azure Advisor configurations.
         /// </summary>
@@ -84,7 +84,7 @@ public partial interface IConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -109,7 +109,7 @@ public partial interface IConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -118,7 +118,7 @@ public partial interface IConfigurationsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ARMErrorResponseBody>> CreateInResourceGroupWithHttpMessagesAsync(ConfigData configContract, string resourceGroup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ConfigData>> CreateInResourceGroupWithHttpMessagesAsync(ConfigData configContract, string resourceGroup, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Retrieve Azure Advisor configurations.
         /// </summary>
@@ -135,7 +135,7 @@ public partial interface IConfigurationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="ArmErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponse.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponse.cs
new file mode 100644
index 0000000000000..3e6fe92637eed
--- /dev/null
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponse.cs
@@ -0,0 +1,46 @@
+// <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.Advisor.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    public partial class ArmErrorResponse
+    {
+        /// <summary>
+        /// Initializes a new instance of the ArmErrorResponse class.
+        /// </summary>
+        public ArmErrorResponse()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArmErrorResponse class.
+        /// </summary>
+        public ArmErrorResponse(ARMErrorResponseBody error = default(ARMErrorResponseBody))
+        {
+            Error = error;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "error")]
+        public ARMErrorResponseBody Error { get; set; }
+
+    }
+}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponseException.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponseException.cs
new file mode 100644
index 0000000000000..e0f0706b5a19e
--- /dev/null
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ArmErrorResponseException.cs
@@ -0,0 +1,62 @@
+// <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.Advisor.Models
+{
+    using Microsoft.Rest;
+
+    /// <summary>
+    /// Exception thrown for an invalid response with ArmErrorResponse
+    /// information.
+    /// </summary>
+    public partial class ArmErrorResponseException : RestException
+    {
+        /// <summary>
+        /// Gets information about the associated HTTP request.
+        /// </summary>
+        public HttpRequestMessageWrapper Request { get; set; }
+
+        /// <summary>
+        /// Gets information about the associated HTTP response.
+        /// </summary>
+        public HttpResponseMessageWrapper Response { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body object.
+        /// </summary>
+        public ArmErrorResponse Body { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the ArmErrorResponseException class.
+        /// </summary>
+        public ArmErrorResponseException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArmErrorResponseException class.
+        /// </summary>
+        /// <param name="message">The exception message.</param>
+        public ArmErrorResponseException(string message)
+            : this(message, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArmErrorResponseException class.
+        /// </summary>
+        /// <param name="message">The exception message.</param>
+        /// <param name="innerException">Inner exception.</param>
+        public ArmErrorResponseException(string message, System.Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/Category.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/Category.cs
index 5a74551292a25..120c76c5893a7 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/Category.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/Category.cs
@@ -20,5 +20,6 @@ public static class Category
         public const string Security = "Security";
         public const string Performance = "Performance";
         public const string Cost = "Cost";
+        public const string OperationalExcellence = "OperationalExcellence";
     }
 }
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigData.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigData.cs
index 560d2cfa5d9c2..54165343ff79f 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigData.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigData.cs
@@ -10,13 +10,18 @@
 
 namespace Microsoft.Azure.Management.Advisor.Models
 {
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
     using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
     /// The Advisor configuration data structure.
     /// </summary>
-    public partial class ConfigData
+    [Rest.Serialization.JsonTransformation]
+    public partial class ConfigData : Resource
     {
         /// <summary>
         /// Initializes a new instance of the ConfigData class.
@@ -29,18 +34,23 @@ public ConfigData()
         /// <summary>
         /// Initializes a new instance of the ConfigData class.
         /// </summary>
-        /// <param name="id">The resource Id of the configuration
-        /// resource.</param>
-        /// <param name="type">The type of the configuration resource.</param>
-        /// <param name="name">The name of the configuration resource.</param>
-        /// <param name="properties">The list of property name/value
-        /// pairs.</param>
-        public ConfigData(string id = default(string), string type = default(string), string name = default(string), ConfigDataProperties properties = default(ConfigDataProperties))
+        /// <param name="id">The resource ID.</param>
+        /// <param name="name">The name of the resource.</param>
+        /// <param name="type">The type of the resource.</param>
+        /// <param name="exclude">Exclude the resource from Advisor
+        /// evaluations. Valid values: False (default) or True.</param>
+        /// <param name="lowCpuThreshold">Minimum percentage threshold for
+        /// Advisor low CPU utilization evaluation. Valid only for
+        /// subscriptions. Valid values: 5 (default), 10, 15 or 20. Possible
+        /// values include: '5', '10', '15', '20'</param>
+        /// <param name="digests">Advisor digest configuration. Valid only for
+        /// subscriptions</param>
+        public ConfigData(string id = default(string), string name = default(string), string type = default(string), bool? exclude = default(bool?), string lowCpuThreshold = default(string), IList<DigestConfig> digests = default(IList<DigestConfig>))
+            : base(id, name, type)
         {
-            Id = id;
-            Type = type;
-            Name = name;
-            Properties = properties;
+            Exclude = exclude;
+            LowCpuThreshold = lowCpuThreshold;
+            Digests = digests;
             CustomInit();
         }
 
@@ -50,28 +60,27 @@ public ConfigData()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the resource Id of the configuration resource.
+        /// Gets or sets exclude the resource from Advisor evaluations. Valid
+        /// values: False (default) or True.
         /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; set; }
+        [JsonProperty(PropertyName = "properties.exclude")]
+        public bool? Exclude { get; set; }
 
         /// <summary>
-        /// Gets or sets the type of the configuration resource.
+        /// Gets or sets minimum percentage threshold for Advisor low CPU
+        /// utilization evaluation. Valid only for subscriptions. Valid values:
+        /// 5 (default), 10, 15 or 20. Possible values include: '5', '10',
+        /// '15', '20'
         /// </summary>
-        [JsonProperty(PropertyName = "type")]
-        public string Type { get; set; }
+        [JsonProperty(PropertyName = "properties.lowCpuThreshold")]
+        public string LowCpuThreshold { get; set; }
 
         /// <summary>
-        /// Gets or sets the name of the configuration resource.
+        /// Gets or sets advisor digest configuration. Valid only for
+        /// subscriptions
         /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of property name/value pairs.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties")]
-        public ConfigDataProperties Properties { get; set; }
+        [JsonProperty(PropertyName = "properties.digests")]
+        public IList<DigestConfig> Digests { get; set; }
 
     }
 }
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigDataProperties.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigDataProperties.cs
deleted file mode 100644
index 283e0cf44197d..0000000000000
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ConfigDataProperties.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// <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.Advisor.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// The list of property name/value pairs.
-    /// </summary>
-    public partial class ConfigDataProperties
-    {
-        /// <summary>
-        /// Initializes a new instance of the ConfigDataProperties class.
-        /// </summary>
-        public ConfigDataProperties()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ConfigDataProperties class.
-        /// </summary>
-        /// <param name="additionalProperties">Unmatched properties from the
-        /// message are deserialized this collection</param>
-        /// <param name="exclude">Exclude the resource from Advisor
-        /// evaluations. Valid values: False (default) or True.</param>
-        /// <param name="lowCpuThreshold">Minimum percentage threshold for
-        /// Advisor low CPU utilization evaluation. Valid only for
-        /// subscriptions. Valid values: 5 (default), 10, 15 or 20.</param>
-        public ConfigDataProperties(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), bool? exclude = default(bool?), string lowCpuThreshold = default(string))
-        {
-            AdditionalProperties = additionalProperties;
-            Exclude = exclude;
-            LowCpuThreshold = lowCpuThreshold;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets unmatched properties from the message are deserialized
-        /// this collection
-        /// </summary>
-        [JsonExtensionData]
-        public IDictionary<string, object> AdditionalProperties { get; set; }
-
-        /// <summary>
-        /// Gets or sets exclude the resource from Advisor evaluations. Valid
-        /// values: False (default) or True.
-        /// </summary>
-        [JsonProperty(PropertyName = "exclude")]
-        public bool? Exclude { get; set; }
-
-        /// <summary>
-        /// Gets or sets minimum percentage threshold for Advisor low CPU
-        /// utilization evaluation. Valid only for subscriptions. Valid values:
-        /// 5 (default), 10, 15 or 20.
-        /// </summary>
-        [JsonProperty(PropertyName = "low_cpu_threshold")]
-        public string LowCpuThreshold { get; set; }
-
-    }
-}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/CpuThreshold.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/CpuThreshold.cs
new file mode 100644
index 0000000000000..5ff901369049d
--- /dev/null
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/CpuThreshold.cs
@@ -0,0 +1,24 @@
+// <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.Advisor.Models
+{
+
+    /// <summary>
+    /// Defines values for CpuThreshold.
+    /// </summary>
+    public static class CpuThreshold
+    {
+        public const string Five = "5";
+        public const string OneZero = "10";
+        public const string OneFive = "15";
+        public const string TwoZero = "20";
+    }
+}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfig.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfig.cs
new file mode 100644
index 0000000000000..cec820d5b9710
--- /dev/null
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfig.cs
@@ -0,0 +1,108 @@
+// <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.Advisor.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Advisor Digest configuration entity
+    /// </summary>
+    public partial class DigestConfig
+    {
+        /// <summary>
+        /// Initializes a new instance of the DigestConfig class.
+        /// </summary>
+        public DigestConfig()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DigestConfig class.
+        /// </summary>
+        /// <param name="name">Name of digest configuration. Value is
+        /// case-insensitive and must be unique within a subscription.</param>
+        /// <param name="actionGroupResourceId">Action group resource id used
+        /// by digest.</param>
+        /// <param name="frequency">Frequency that digest will be triggered, in
+        /// days. Value must be between 7 and 30 days inclusive.</param>
+        /// <param name="categories">Categories to send digest for. If
+        /// categories are not provided, then digest will be sent for all
+        /// categories.</param>
+        /// <param name="language">Language for digest content body. Value must
+        /// be ISO 639-1 code for one of Azure portal supported languages.
+        /// Otherwise, it will be converted into one. Default value is English
+        /// (en).</param>
+        /// <param name="state">State of digest configuration. Possible values
+        /// include: 'Active', 'Disabled'</param>
+        public DigestConfig(string name = default(string), string actionGroupResourceId = default(string), int? frequency = default(int?), IList<string> categories = default(IList<string>), string language = default(string), string state = default(string))
+        {
+            Name = name;
+            ActionGroupResourceId = actionGroupResourceId;
+            Frequency = frequency;
+            Categories = categories;
+            Language = language;
+            State = state;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets name of digest configuration. Value is
+        /// case-insensitive and must be unique within a subscription.
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets action group resource id used by digest.
+        /// </summary>
+        [JsonProperty(PropertyName = "actionGroupResourceId")]
+        public string ActionGroupResourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets frequency that digest will be triggered, in days.
+        /// Value must be between 7 and 30 days inclusive.
+        /// </summary>
+        [JsonProperty(PropertyName = "frequency")]
+        public int? Frequency { get; set; }
+
+        /// <summary>
+        /// Gets or sets categories to send digest for. If categories are not
+        /// provided, then digest will be sent for all categories.
+        /// </summary>
+        [JsonProperty(PropertyName = "categories")]
+        public IList<string> Categories { get; set; }
+
+        /// <summary>
+        /// Gets or sets language for digest content body. Value must be ISO
+        /// 639-1 code for one of Azure portal supported languages. Otherwise,
+        /// it will be converted into one. Default value is English (en).
+        /// </summary>
+        [JsonProperty(PropertyName = "language")]
+        public string Language { get; set; }
+
+        /// <summary>
+        /// Gets or sets state of digest configuration. Possible values
+        /// include: 'Active', 'Disabled'
+        /// </summary>
+        [JsonProperty(PropertyName = "state")]
+        public string State { get; set; }
+
+    }
+}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfigState.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfigState.cs
new file mode 100644
index 0000000000000..71abaeb0b2b10
--- /dev/null
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/DigestConfigState.cs
@@ -0,0 +1,22 @@
+// <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.Advisor.Models
+{
+
+    /// <summary>
+    /// Defines values for DigestConfigState.
+    /// </summary>
+    public static class DigestConfigState
+    {
+        public const string Active = "Active";
+        public const string Disabled = "Disabled";
+    }
+}
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ResourceRecommendationBase.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ResourceRecommendationBase.cs
index 0c4e0b9643ef3..96d7ca9cf3a56 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ResourceRecommendationBase.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/Models/ResourceRecommendationBase.cs
@@ -39,7 +39,7 @@ public ResourceRecommendationBase()
         /// <param name="type">The type of the resource.</param>
         /// <param name="category">The category of the recommendation. Possible
         /// values include: 'HighAvailability', 'Security', 'Performance',
-        /// 'Cost'</param>
+        /// 'Cost', 'OperationalExcellence'</param>
         /// <param name="impact">The business impact of the recommendation.
         /// Possible values include: 'High', 'Medium', 'Low'</param>
         /// <param name="impactedField">The resource type identified by
@@ -83,7 +83,8 @@ public ResourceRecommendationBase()
 
         /// <summary>
         /// Gets or sets the category of the recommendation. Possible values
-        /// include: 'HighAvailability', 'Security', 'Performance', 'Cost'
+        /// include: 'HighAvailability', 'Security', 'Performance', 'Cost',
+        /// 'OperationalExcellence'
         /// </summary>
         [JsonProperty(PropertyName = "properties.category")]
         public string Category { get; set; }
diff --git a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/SdkInfo_AdvisorManagementClient.cs b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/SdkInfo_AdvisorManagementClient.cs
index f497618657182..bad0b4a71623c 100644
--- a/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/SdkInfo_AdvisorManagementClient.cs
+++ b/sdk/advisor/Microsoft.Azure.Management.Advisor/src/Generated/SdkInfo_AdvisorManagementClient.cs
@@ -19,11 +19,11 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_AdvisorManageme
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("Advisor", "Configurations", "2017-04-19"),
-                new Tuple<string, string, string>("Advisor", "Operations", "2017-04-19"),
-                new Tuple<string, string, string>("Advisor", "RecommendationMetadata", "2017-04-19"),
-                new Tuple<string, string, string>("Advisor", "Recommendations", "2017-04-19"),
-                new Tuple<string, string, string>("Advisor", "Suppressions", "2017-04-19"),
+                new Tuple<string, string, string>("Advisor", "Configurations", "2020-01-01"),
+                new Tuple<string, string, string>("Advisor", "Operations", "2020-01-01"),
+                new Tuple<string, string, string>("Advisor", "RecommendationMetadata", "2020-01-01"),
+                new Tuple<string, string, string>("Advisor", "Recommendations", "2020-01-01"),
+                new Tuple<string, string, string>("Advisor", "Suppressions", "2020-01-01"),
               }.AsEnumerable();
           }
       }